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

9089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Jones
0cfbd6e062 Merge branch 'release_3.0.3' into stable 
* release_3.0.3:
  Update SELinux policy to allow httpd_t to execute files in lib_t and var_lib_t
 2016-10-28 14:02:42 -04:00
Matthew Jones
0f651c8903 Merge branch 'release_3.0.3' into stable 
* release_3.0.3: (48 commits)
  Bumping changelog for 3.0.3
  Update rax.py inventory
  Revert "filter internal User.admin_roles from the /roles API list view"
  fix spelling of disassociated
  Resolves 404 when assigning resources/users to organizations in card view. Sidesteps a bug in the Refresh() utility, where pagination calculations are not made against filtered results.
  Sync azure changes to Tower virtual environment
  Add regions here as well.
  Also bump boto for new regions, per ryansb.
  More regions!
  Revert "bump shade version"
  bump shade version
  Hack copying of job_template.related.survey_spec into ui job copy flow, resolves #3737
  Revert "bump shade version"
  bump shade version
  Switch pg user auth from trust to peer
  Remove support@ansible.com, clean up some old links.
  filter internal User.admin_roles from the /roles API list view
  Exclude test directory from setup bundle tarballs
  fixed manual project select2 population
  YAML parsing groups and hosts extra variables
  ...
 2016-10-28 11:37:57 -04:00
Wayne Witzel III
c5a9439198 Merge pull request #3776 from wwitzel3/release_3.0.3 
Revert "filter internal User.admin_roles from the /roles API list view"
 2016-10-27 14:16:13 -04:00
James Laska
f129c42929 Update rax.py inventory 
Resolves https://github.com/ansible/ansible/pull/18204 and continues
support for disabling SSL verification.

Fixes #3709
 2016-10-26 15:59:41 -04:00
Wayne Witzel III
b11f5c3015 Revert "filter internal User.admin_roles from the /roles API list view" 
This reverts commit 2a55bfa5741e91c466570e7b4cf9b517d366c610.
 2016-10-25 13:40:15 -04:00
James Laska
ed8bbc2bbd Merge pull request #3774 from ansible/AlanCoding-patch-2 
Fix spelling of disassociated
 2016-10-25 12:02:34 -04:00
Alan Rominger
9f15fc3873 fix spelling of disassociated 2016-10-25 11:53:43 -04:00
Leigh Johnson
5dfd9d4ec9 Merge pull request #3762 from leigh-johnson/3750 
Resolves 404 when assigning resources/users to organizations in card view
 2016-10-24 15:25:56 -04:00
Leigh Johnson
a3123011ad Resolves 404 when assigning resources/users to organizations in card view. Sidesteps a bug in the Refresh() utility, where pagination calculations 
are not made against filtered results.

Resolves #750
 2016-10-24 13:49:37 -04:00
Bill Nottingham
5b45f5b6b9 Merge pull request #3753 from wenottingham/azure-oops 
Sync azure changes to Tower virtual environment
 2016-10-20 13:49:04 -04:00
Matthew Jones
e77b9b877a Merge pull request #3710 from wwitzel3/release_3.0.3 
filter internal User.admin_roles from the /roles API list view
 2016-10-20 13:45:25 -04:00
Bill Nottingham
cced987862 Merge pull request #3751 from wenottingham/OH-IO 
Add new AWS regions.
 2016-10-20 10:14:31 -04:00
Leigh Johnson
6080ecceca Merge pull request #3749 from leigh-johnson/3737 
If a job template has a survey, copy it too
 2016-10-19 16:26:06 -05:00
Bill Nottingham
40fdd3eba5 Sync azure changes to Tower virtual environment 2016-10-19 16:49:49 -04:00
Bill Nottingham
94b20d4fc6 Also bump boto for new regions, per ryansb. 2016-10-19 16:16:05 -04:00
Bill Nottingham
5c69ed2e9f More regions! 2016-10-19 16:15:09 -04:00
Chris Meyers
49c90b8f2d Revert "bump shade version" 
This reverts commit 0125d114fdf8be5f3a5fdab856c92d82a2988607.
 2016-10-19 14:17:04 -04:00
Chris Meyers
8a4d6b6f35 bump shade version 2016-10-19 14:07:20 -04:00
Leigh Johnson
ec140fb7da Hack copying of job_template.related.survey_spec into ui job copy flow, 
resolves #3737
 2016-10-19 12:45:28 -05:00
Chris Meyers
b43945b0f2 Revert "bump shade version" 
This reverts commit d0a7313a4ccb1cfca3c7655b34b61c6cb6861909.
 2016-10-19 12:33:53 -04:00
Chris Meyers
6d07699b29 bump shade version 2016-10-18 18:02:30 -04:00
Bill Nottingham
83892b0d5f Merge pull request #3726 from wenottingham/support-fu 
Remove support@ansible.com, clean up some old links.
 2016-10-17 15:21:41 -04:00
Bill Nottingham
d89c07a25b Remove support@ansible.com, clean up some old links. 
Cherry-picked from devel.
 2016-10-17 15:18:46 -04:00
Chris Church
f988e3791c Merge pull request #3648 from cchurch/no-filter-on-password-fields 
Prevent filtering on password fields.
 2016-10-14 14:19:43 -04:00
jlmitch5
237e91bcb2 Merge pull request #3681 from jlmitch5/fixManProjectSelect 
fixed manual project select2 population
 2016-10-13 12:40:47 -04:00
Wayne Witzel III
280d265d4e filter internal User.admin_roles from the /roles API list view 2016-10-13 12:29:02 -04:00
Shane McDonald
57c599df41 Exclude test directory from setup bundle tarballs 
Also using the rsync strategy in the tar-build target. This doesn’t leave behind the empty setup/test directory.
 2016-10-13 10:08:03 -04:00
Jared Tabor
3be9bf19ee Merge pull request #3672 from jaredevantabor/groups-hosts-yaml-parser 
YAML parsing groups and hosts extra variables
 2016-10-10 11:05:36 -07:00
John Mitchell
236d4df460 fixed manual project select2 population 2016-10-10 12:31:08 -04:00
Jared Tabor
dbe6f5200f YAML parsing groups and hosts extra variables 
YAML parsing got lost in translation in the 3.0 scuffle
 2016-10-07 14:58:31 -07:00
James Laska
77a56b3dfd Properly recognize foreman.enabled 
The ENABLED_VALUE must always be a string.  Thanks to @cchurch for the
suggestion.

Resolves #3632
 2016-10-07 09:50:18 -04:00
James Laska
5881736769 Properly detect enabled foreman inventory 
Related #3632
 2016-10-07 09:49:31 -04:00
John Mitchell
f35fcf86e7 fixed search pagination url issue 2016-10-06 16:14:07 -04:00
Leigh Johnson
4a4c55a75c Merge pull request #3660 from leigh-johnson/3327 
Host event modal - wrap long strings
 2016-10-06 13:37:27 -04:00
Michael Abashian
3d2541a3e1 Merge pull request #3643 from mabashian/3333-inventory-vars-host-edit 
Format the host vars properly on load when editing a host
 2016-10-06 13:15:31 -04:00
Leigh Johnson
dc9344c822 Host event modal - wrap long strings. 2016-10-06 11:53:58 -04:00
Chris Church
9fc30643ca Prevent filtering on password fields. 2016-10-03 16:18:41 -04:00
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
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
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
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
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
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
AlanCoding
115dfac471 do not introspect extra_vars, speed up tests, add base case test 2016-09-29 16:42:41 -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
f30c8c0bb8 Update postgres yum/apt repo locations 
*Thanks postgres team

(cherry picked from commit b398fcc5b97ed478273e3d124aaaaa3af2879965)
 2016-09-29 10:42:08 -04:00