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

17638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Nottingham
a98367f4ac
Merge pull request #2068 from aperigault/devel 
Update SAML doc
 2018-07-13 11:05:55 -04:00
aperigault
8ad7d4f699 Update SAML doc 2018-07-13 15:39:46 +02:00
Chris Meyers
38de79b81f
Merge pull request #1576 from aperigault/devel 
Map users in organizations based on saml groups
 2018-07-13 09:03:32 -04:00
Ryan Petrello
07ddfe2c9c
Merge pull request #2059 from mattclay/node-pool 
Switch AWX to a dedicated Shippable node pool.
 2018-07-10 15:21:35 -04:00
Matt Clay
18b7b3e028 Switch AWX to a dedicated Shippable node pool. 
Signed-off-by: Matt Clay <matt@mystile.com>
 2018-07-10 11:58:09 -07:00
Bill Nottingham
a4b1cb6e20
Merge pull request #2055 from wenottingham/sattests 
add want_hostcollections for sat6 source vars (with tests)
 2018-07-09 12:05:26 -04:00
Bill Nottingham
64cfbe7642 add tests 2018-07-09 11:49:45 -04:00
moss
0f50dfd617 add want_hostcollections for sat6 source vars 
Signed-off-by: moss <smossber@redhat.com>
 2018-07-09 10:45:16 -04:00
Bill Nottingham
4737200566
Merge pull request #2051 from wenottingham/remove-issue-link 
Rework reporting issues/get involved.
 2018-07-09 10:17:30 -04:00
Bill Nottingham
4f02fe0b32 Rework reporting issues/get involved. 
Denote that bugs & ideas go to the issue tracking repo, and discussion goes to mailing list/IRC.
 2018-07-06 14:27:12 -04:00
Bill Nottingham
2e980293d9
Merge pull request #2009 from cdvv7788/Issue/1506 
Make LAST UPDATED field in projects table sortable #1506
 2018-06-25 16:27:30 -04:00
Bill Nottingham
0d03036fb1
Merge pull request #1629 from robruma/feature/update_callback_scripts 
Updates to callback scripts
 2018-06-25 15:47:25 -04:00
Ryan Petrello
a4271024fe
Merge pull request #2014 from cdvv7788/fix-contributing-docs 
Fix issue with table of contents(CONTRIBUTING.md)
 2018-06-25 15:37:46 -04:00
Ryan Petrello
37972ec9da
Merge pull request #1876 from paneu/azure-rm-inv-variables 
Enable source variables for Azure inventory
 2018-06-25 15:36:27 -04:00
Ryan Petrello
d8c4f118c2
Merge pull request #2020 from ryanpetrello/fix-tz-test 
fix a failing timezone test
 2018-06-25 15:36:15 -04:00
Ryan Petrello
1b2d7ed748
fix a failing timezone test 2018-06-25 15:18:29 -04:00
Paul Neumann
f6eb534f30 Extend unit test for Azure source variable generation 
Add tests for generation of Azure source variables. Test cases such
as overwriting a variable with its default value, overwriting a variable
with something different to its default value and add variables not set
by default.
 2018-06-25 20:26:20 +02:00
Paul Neumann
33f9834747 Enable source variables for Azure inventory 2018-06-25 20:26:20 +02:00
Christian Adams
602f60b9b2
Merge pull request #2019 from rooftopcellist/cp_pytest_upgrade 
update dev pytest
 2018-06-25 13:27:20 -04:00
adamscmRH
3b36f85989 update dev pytest 2018-06-25 13:22:17 -04:00
Cristian Vargas
19ca2581fa Fix issue with table of contents(links) 
Signed-off-by: Cristian Vargas <cristian@swapps.co>
 2018-06-23 13:16:38 -05:00
Cristian Vargas
5a8f4060b7 Remove trailing comma 
Signed-off-by: Cristian Vargas <cristian@swapps.co>
 2018-06-21 11:53:33 -05:00
Cristian Vargas
fc745e1979 Make LAST UPDATED field in projects table sortable 
Signed-off-by: Cristian Vargas <cristian@swapps.co>
 2018-06-20 22:42:18 -05:00
Shane McDonald
4f5a0d5a08
Merge pull request #1994 from taylorsmithgg/patch-1 
Update INSTALL.md
 2018-06-18 14:15:45 -04:00
Taylor Smith
e768e3f743
Update INSTALL.md 
Fix link for kubernetes installer
 2018-06-18 10:15:38 -07:00
Ryan Petrello
4df4d7366e
Merge pull request #1983 from lshchur/patch-1 
Update INSTALL.md
 2018-06-12 08:25:09 -04:00
Lyosha Shchur
99e6c21cbd
Update INSTALL.md 2018-06-12 11:57:24 +03:00
Yunfan Zhang
4fe7c9ea42
Merge pull request #1953 from YunfanZhang42/devel 
Let create_oauth2_token print errors from std_err.
 2018-06-04 16:42:44 -04:00
Yunfan Zhang
64b612921d
Merge branch 'devel' into devel 2018-06-04 15:54:23 -04:00
Yunfan Zhang
9945a3bc64 Added an awx-manage command for generating OAuth2 token. 2018-06-04 15:49:04 -04:00
Yunfan Zhang
a45ccfdc79
Merge pull request #1942 from YunfanZhang42/devel 
Added an awx-manage command for generating OAuth2 token.
 2018-05-31 16:13:58 -04:00
Yunfan Zhang
2c4f7911a6 Added an awx-manage command for generating OAuth2 token. 2018-05-31 14:27:21 -04:00
Bill Nottingham
01dcb3f733
Merge pull request #1938 from tux-00/patch-1 
Fix bad path in installation doc
 2018-05-31 09:56:43 -04:00
Raphaël B
f485185562
Fix bad path 2018-05-31 11:32:55 +02:00
Bill Nottingham
c3ab51e8fe
Merge pull request #1924 from pilou-/ansible_venv_readd_netaddr 
ansible virtualenv: re-add netaddr Python package
 2018-05-30 10:27:08 -04:00
Pierre-Louis Bonicoli
a752d04505
ansible venv: re-add netaddr Python package 
Closes #1763
 2018-05-30 02:01:03 +02:00
Bill Nottingham
bd744bced7
Merge pull request #1912 from wenottingham/great-pexpectations 
Regen requirements (followon to https://github.com/ansible/awx/pull/1895)
 2018-05-24 14:34:56 -04:00
Bill Nottingham
f4c165bf28 Regen requirements (followon to https://github.com/ansible/awx/pull/1895) 2018-05-24 14:14:17 -04:00
Alan Rominger
da2fa14bf7
Merge pull request #1910 from AlanCoding/moflake8 
flake8 errors in access.py due to an upgrade
 2018-05-24 11:47:37 -04:00
AlanCoding
1466e5c343
flake8 errors in access.py due to an upgrade 2018-05-24 10:17:55 -04:00
Bill Nottingham
00877769a3
Merge pull request #1895 from sumkincpp/patch-1 
Support for expect ansible module
 2018-05-22 16:43:48 -04:00
Fedor Sumkin
809de21451
adding pexpect support 2018-05-19 18:42:50 +03:00
Matthew Jones
72f2994cc5
Merge branch 'release_3.3.0' into devel 2018-05-17 16:07:47 -04:00
Ryan Petrello
2e0125037a
Merge pull request #1836 from ryanpetrello/hands-off-my-tokens 
filter `/api/v2/users/N/tokens/` to only show tokens for _that_ user
 2018-05-17 15:54:28 -04:00
Ryan Petrello
51f66b8c0a filter /api/v2/users/N/tokens/ to only show tokens for _that_ user 
see: https://github.com/ansible/tower/issues/1773
 2018-05-17 15:44:35 -04:00
Chris Meyers
a348893a91
Merge pull request #1846 from chrismeyersfsu/fix-1_in_maxint_chance_of_collision 
more test fixes
 2018-05-17 15:04:56 -04:00
chris meyers
4031c888de fork process may finish before cancel callback 
* The "should we cancel?" callback check is only called while the
subprocess (child) is alive. If the child executes quickly, the cancel
callback has no chance to run.
* call a subprocess that takes longer to run like sleep 2
 2018-05-17 14:39:57 -04:00
chris meyers
d8615df47f postgres back tests can't do this 2018-05-17 14:39:57 -04:00
Ryan Petrello
46add35f98
Merge pull request #1840 from chrismeyersfsu/fix-1_in_maxint_chance_of_collision 
flake8
 2018-05-17 14:15:57 -04:00
chris meyers
88bb98c967 flake8 2018-05-17 13:38:37 -04:00