External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-22 15:08:03 -03:30
Code Issues Packages Projects Releases Wiki Activity
14,596 Commits 54 Branches 19 Tags
Commit Graph

14596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mabashian
6097bc2f17 Fixed bug where editing a host was showing oddly formatted YAML in the variables section 2016-10-03 11:34:27 -04:00
AlanCoding
3d38637b2d update migration name 2016-10-03 11:16:08 -04:00
Chris Meyers
9e3528de31 change migration name to align with version semantic 2016-10-03 11:15:33 -04:00
Wayne Witzel III
e4c5b9cb18 Merge pull request #3642 from wwitzel3/channels-up 
Merge dev and latest channels branch changes.
 2016-10-03 10:47:54 -04:00
Wayne Witzel III
0088c5a410 add asgi_amqp req 2016-10-03 10:43:44 -04:00
Wayne Witzel III
3fab2b63b9 dev non-clustering rabbitmq with lvc enabled 2016-10-03 10:42:52 -04:00
Matthew Jones
959342a5fd Fixing up unit tests from HA/Clustering work 
* Also purge old fact migration tests
* Upgrade some services on various container images
 2016-10-03 10:40:30 -04:00
Michael Abashian
3dc07859bc Merge pull request #3641 from mabashian/3536-inventory-update-redirect 
Stay on project/inventory manage pages when a sync is initiated
 2016-10-03 10:39:50 -04:00
Wayne Witzel III
530a5c0c88 merging devel 2016-10-03 10:35:50 -04:00
Michael Abashian
6697fe411c Merge pull request #3629 from mabashian/3482-user-teams-empty-list 
Updated user's teams list empty text
 2016-10-03 10:15:25 -04:00
Shane McDonald
16129b6e64 Add pycparser to SRC_ONLY_PKGS 
Fixes stuff due to https://github.com/pyca/cryptography/issues/3187
 2016-10-03 10:12:39 -04:00
AlanCoding
020c66f6ce make validate_license common to all can_start methods 2016-10-03 10:09:41 -04:00
Chris Meyers
b4c852cf53 change migration name to align with version semantic 2016-10-03 10:06:50 -04:00
mabashian
b4c5e31a1d Stay on the projects/inv manage pages when syncs are launched from those pages. Otherwise, direct the user to the stdout pages for those individual updates. 2016-10-03 09:59:56 -04:00
Shane McDonald
15eaac049c Add pycparser to SRC_ONLY_PKGS 
Fixes stuff due to https://github.com/pyca/cryptography/issues/3187
 2016-10-03 09:37:06 -04:00
Chris Meyers
203df91a5d more robust test mode checking 2016-10-03 09:28:44 -04:00
AlanCoding
b2fb7694dc Merge branch 'devel' of https://github.com/ansible/ansible-tower into wf_rbac_prompt 2016-10-03 08:43:05 -04:00
Chris Meyers
9b451076fc Merge pull request #3639 from chrismeyersfsu/improvement-workflows_root_endpoints 
add workflow root endpoints
 2016-10-03 08:30:29 -04:00
Chris Meyers
649bf08edf add workflow root endpoints 2016-10-03 08:15:39 -04:00
Bill Nottingham
8677c5cceb Merge pull request #3626 from wenottingham/devel 
Update help text to reflect 3.0 remove: default change
 2016-09-30 15:52:29 -04:00
Chris Church
70e489d62f Save settings.LICENSE as dict instead of str. 2016-09-30 15:30:34 -04:00
Graham Mainwaring
4ca8bc1eda Merge pull request #3630 from ghjm/restore_apache_fix 
Use correct Apache service name when restoring on EL6
 2016-09-30 13:28:14 -04:00
mabashian
e36a4ed47e Updated user's teams list empty text to read: "This user is not a member of any teams" 2016-09-30 10:14:08 -04:00
AlanCoding
2faafa8071 Merge branch 'devel' of https://github.com/ansible/ansible-tower into wf_rbac_prompt 2016-09-30 10:06:23 -04:00
AlanCoding
2776a56043 bump migration after another one was merged 2016-09-30 09:03:31 -04:00
Alan Rominger
61fabbd92e Merge pull request #3621 from AlanCoding/3605_relaunch_perm 
Involve prompted fields in job relaunch permissions
 2016-09-29 17:07:23 -04:00
Bill Nottingham
cc4025977f Update help text to reflect 3.0 remove: default change 2016-09-29 17:01:11 -04:00
AlanCoding
115dfac471 do not introspect extra_vars, speed up tests, add base case test 2016-09-29 16:42:41 -04:00
Chris Meyers
16ef45f096 Merge pull request #3624 from chrismeyersfsu/improvement-allow_simultaneous 
Improvement allow simultaneous
 2016-09-29 16:36:51 -04:00
Bill Nottingham
f3d4fb7d5b Use implementation-neutral label/descriptions for proot/bubblewrap configuration items. 2016-09-29 16:24:38 -04:00
Bill Nottingham
d4bffd31e7 Update old tests. 2016-09-29 16:24:38 -04:00
Bill Nottingham
8265934c2d Use bubblewrap (https://github.com/projectatomic/bubblewrap) instead of proot. 2016-09-29 16:23:30 -04:00
Chris Meyers
9cafebd8db remove job to jt allow_simultaneous dependency 
* Foreshadowing of what's to come with the task manager. When deciding
on what job to run in our task manager, we can't depend on job template
fields. Otherwise, this would cost us a query.
 2016-09-29 16:19:19 -04:00
Chris Meyers
1a60dd89bd add back in removed method 2016-09-29 16:01:51 -04:00
Chris Meyers
ec2b0ac90d add back in removed method 2016-09-29 16:01:15 -04:00
AlanCoding
f82b10f018 Job relaunch permissions made consistent with JT prompts 2016-09-29 13:35:47 -04:00
Matthew Jones
870f8d6b1e Fix up deb packaging paths 2016-09-29 13:18:24 -04:00
Matthew Jones
4d22af0d3c Fix up ubuntu apt repo paths 2016-09-29 13:16:58 -04:00
Matthew Jones
be18737802 Merge branch 'ha_installer' into devel 
* ha_installer:
  Fixing up some minor nits with ha setup playbook
  Update postgres yum/apt repo locations
  Add note about when to use short/long name
  Setup playbook modifications for HA/Ramparts
 2016-09-29 12:29:25 -04:00
Matthew Jones
a648beba90 Rev django security version 2016-09-29 12:03:06 -04:00
Matthew Jones
6b0e337886 Update postgres yum/apt repo locations 
*Thanks postgres team
 2016-09-29 11:25:08 -04:00
Matthew Jones
f30c8c0bb8 Update postgres yum/apt repo locations 
*Thanks postgres team

(cherry picked from commit b398fcc5b97ed478273e3d124aaaaa3af2879965)
 2016-09-29 10:42:08 -04:00
Matthew Jones
dbca95fb2a Update postgres yum/apt repo locations 
*Thanks postgres team
 2016-09-29 10:37:18 -04:00
Chris Meyers
dd3c3c9f29 Merge branch 'feature-ha_task_manager' into devel 2016-09-29 10:27:17 -04:00
Chris Meyers
fbc1dff4de flake8 fixes 2016-09-29 10:23:00 -04:00
Chris Meyers
bdd444fb44 removed print 2016-09-29 09:53:36 -04:00
Aaron Tan
cf39f28d62 Merge pull request #3238 from jangsutsr/3088_make_admin_visible_to_oprhaned_users 
Make system admin and system auditor visible to oprhaned users.
 2016-09-29 09:42:05 -04:00
Graham Mainwaring
bcc9d3a3ac Merge pull request #3611 from ghjm/makefile-flagfiles 
Add Makefile flag file for ui-release
 2016-09-28 17:25:52 -04:00
Alan Rominger
e8903456f8 Merge pull request #3616 from AlanCoding/capabilities_fixes 
Fixes to user_capabilities from QE bugs
 2016-09-28 16:29:42 -04:00
Aaron Tan
3acaca376a Merge pull request #3615 from jangsutsr/3486_notification_failure_wrt_unicode_jt_name 
Convert notification_subject from byte string to unicode.
 2016-09-28 16:26:21 -04:00