13311 Commits

Author SHA1 Message Date
Bill Nottingham
09f5c23737 Ensure we quote '/' in username/password for SCM credentials. 2017-07-05 11:45:29 -04:00
Ryan Petrello
430d4bc28e Merge pull request #6827 from ryanpetrello/devel
fix a bug in cluster node version comparison
2017-06-30 11:47:04 -04:00
Ryan Petrello
de84f3cf4a fix a bug in cluster node version comparison 2017-06-30 11:28:04 -04:00
Ryan Petrello
57eb632e51 Merge pull request #6819 from ryanpetrello/fix-6810
isolated nodes should report their awx version in their heartbeat
2017-06-30 09:59:07 -04:00
Chris Meyers
668bce8212 fix job launch deadlock
* This both fixes the deadlock problem and a logic problem. We shouldn't
set the job's job_template current_job to pending jobs.
2017-06-30 09:54:08 -04:00
jlmitch5
413976f2f7 Merge pull request #6814 from jlmitch5/loggingProtocolCtit
add logging protocol and timeout to ctit ui
2017-06-30 08:52:13 -04:00
Alan Rominger
34af7566ce Merge pull request #6759 from AlanCoding/naming_preflights
Add inventory file consistency checks as new preflight
2017-06-29 18:52:35 -04:00
Ryan Petrello
413e8c3bc9 isolated nodes should report their awx version in their heartbeat
see: #6810
2017-06-29 16:55:11 -04:00
Aaron Tan
e8433c6301 Merge pull request #6695 from ansible/jangsutsr_6005_add_boto3_support
Add boto3 dependency and remove requests freezing
2017-06-29 16:41:07 -04:00
Aaron Tan
9aa4ea8e61 Add boto3 dependency and remove requests freezing 2017-06-29 16:03:07 -04:00
Ryan Petrello
e92c40d8ea Merge pull request #6815 from ryanpetrello/fix-rdb
fix the `make rdb` debugging tool
2017-06-29 15:53:05 -04:00
Ryan Petrello
8b0c5e796b Merge pull request #6809 from ryanpetrello/devel
properly configure celery routes for isolated node heartbeat
2017-06-29 15:52:14 -04:00
Ryan Petrello
611c42f741 fix the make rdb debugging tool 2017-06-29 15:40:09 -04:00
John Mitchell
3df6cda4cd add logging protocol and timeout to ctit ui 2017-06-29 15:39:36 -04:00
Alan Rominger
6d85c8bc9f Merge pull request #6710 from AlanCoding/access_registry
Automatically register access classes, don't put into lists
2017-06-29 15:32:05 -04:00
AlanCoding
ad4a7fe033 access_registry made simple dict with auto registration 2017-06-29 15:17:37 -04:00
Alan Rominger
ec773f57d9 Merge pull request #6808 from ansible/AlanCoding-patch-2
Remove extra_hosts that breaks dev environment
2017-06-29 15:09:11 -04:00
jlmitch5
59775c52c9 Merge pull request #6783 from jlmitch5/testLogAggregator
add test log aggregator button to ui
2017-06-29 14:56:41 -04:00
Jared Tabor
112230081e Merge pull request #6795 from jaredevantabor/skip-tags-job-tags
Skip tags job tags
2017-06-29 11:10:26 -07:00
Alan Rominger
9fda4eee85 Remove extra_hosts that breaks dev environment
This was triggered by a docker update, and an empty value of DOCKER_HOST_IP resulted in an error running `make docker-compose`
2017-06-29 13:41:33 -04:00
Jared Tabor
768fa13aef adding type ahead selector to survey
for job tags and skip tags
2017-06-29 09:27:16 -07:00
Jared Tabor
56724ffa50 making job-tags and skip-tags select elements
with type-ahead ability
2017-06-29 09:27:16 -07:00
Aaron Tan
055c83f4e6 Merge pull request #6741 from jangsutsr/6711_trim_querystring_from_reverse_outcome
Trim querystring from reverse outcome
2017-06-29 12:16:54 -04:00
Aaron Tan
a184058aa2 Merge pull request #6642 from jangsutsr/6593_enforce_mutual_exclusiveness_of_tower_user_origins
Expand scope of enterprise user types
2017-06-29 12:15:07 -04:00
Aaron Tan
bfb56480b2 Merge pull request #6705 from jangsutsr/6516_audit_cloud_regions
Audit lists of cloud regions
2017-06-29 12:14:01 -04:00
Aaron Tan
d9d5fb38b8 Merge pull request #6732 from jangsutsr/6719_aggregate_service_restart_attempts
Aggregate Tower service restart attempts
2017-06-29 12:13:01 -04:00
Alan Rominger
68103f2d72 Merge pull request #6720 from AlanCoding/scm_inv_update_resp
Accuracy edit for inventory update response when updating project
2017-06-29 11:45:50 -04:00
Alan Rominger
724a33c945 Merge pull request #6712 from AlanCoding/host_sublist
Optimize inventory hosts sublist
2017-06-29 11:35:37 -04:00
Ryan Petrello
0f503c90ea Merge pull request #6803 from ryanpetrello/devel
properly invoke the byte-compiled isolated job runner in production
2017-06-29 11:33:35 -04:00
Alan Rominger
0d5157013a Merge pull request #6801 from AlanCoding/controlling_queues
Add controlling queue list filter that was unintentionally dropped
2017-06-29 11:16:51 -04:00
Ryan Petrello
ac9bc166a0 properly invoke the byte-compiled isolated job runner in production
see: #5903
2017-06-29 11:11:28 -04:00
Michael Abashian
e2e57c20d6 Merge pull request #6790 from mabashian/4853-survey-workflow-buttons
Show survey and workflow editor buttons even when the editor is open
2017-06-29 10:37:07 -04:00
Alan Rominger
fe959769eb Merge pull request #6738 from AlanCoding/do_nots
Document name schemes you should never use
2017-06-29 10:29:37 -04:00
Michael Abashian
eca357eb42 Merge branch 'devel' into 4853-survey-workflow-buttons 2017-06-29 10:13:13 -04:00
Michael Abashian
20f3a4f788 Merge pull request #6786 from mabashian/hide-delete-job-results-permissions
Hide delete icon when user doesn't have permissions to delete job
2017-06-29 10:12:11 -04:00
Michael Abashian
ca3e8168c4 Merge pull request #6785 from mabashian/4387-related-tooltips
Fixed survey and workflow editor tooltips
2017-06-29 10:11:47 -04:00
Michael Foord
2a20782a81 Merge pull request #6797 from ansible/docker-make-update
Remove deprecated and unneeded -e flag to docker login
2017-06-29 15:00:47 +01:00
Ryan Petrello
d27ca7de40 Merge pull request #6794 from ryanpetrello/fix-6748
more isolated production tinkering
2017-06-29 09:45:45 -04:00
Ryan Petrello
405c01a847 more isolated production tinkering
see: #5903
see: #6507
2017-06-29 09:35:26 -04:00
Wayne Witzel III
363742b15e Merge pull request #6796 from wwitzel3/issue-4382
Tweak background Inventory deletion.
2017-06-29 09:26:23 -04:00
Wayne Witzel III
ad95917db6 fix tests 2017-06-29 08:00:13 -04:00
Michael Foord
f93919a8af Remove deprecated and unneeded -e flag to docker login 2017-06-29 12:40:09 +01:00
Wayne Witzel III
e9235d8b54 update delete_inventory task 2017-06-29 00:15:56 -04:00
Wayne Witzel III
0204fc1347 org on_delete to SET_NULL and migration 2017-06-29 00:15:41 -04:00
Wayne Witzel III
e84ecabe72 add schedule_deletion method and signal 2017-06-29 00:15:11 -04:00
Michael Abashian
0083a9279b Show survey and workflow editor buttons even when the editor is open 2017-06-28 18:01:33 -04:00
Michael Abashian
79c19d14e5 Merge pull request #6773 from mabashian/2824-403-error-message
Tweaked 403 error message
2017-06-28 17:44:04 -04:00
Michael Abashian
2750f074af Merge pull request #6765 from mabashian/2800-survey-create-integer
Added awRange directive
2017-06-28 17:43:19 -04:00
Michael Abashian
6dd507a8fc Merge pull request #6755 from mabashian/1982-fix-smart-float-validation
fixed smart float validation when float field is not required
2017-06-28 17:42:01 -04:00
Michael Abashian
9de9f79dee Hide delete icon when user doesn't have permissions to delete job 2017-06-28 17:33:13 -04:00