valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,723 Commits 24 Branches 182 Tags 341 MiB
396b06fdf8
Commit Graph

82723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
396b06fdf8 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-06-07 09:54:20 -06:00
Mike Place
45326ccdec Merge pull request #41621 from gtmanfred/mac 
Fix some mac tests
 2017-06-07 10:19:25 -05:00
Erik Johnson
913450bd45 Merge pull request #41620 from Ch3LL/skip_mac_git 
Skip git_pillar tests on MacOSX
 2017-06-07 09:07:01 -05:00
Nicole Thomas
832b96ea05 Merge pull request #41614 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-06-06 18:42:44 -06:00
Mike Place
bc0f9699ca Merge pull request #41613 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-06-06 17:39:54 -05:00
rallytime
8aaadd8787 Revert "Update new pyroute2 unit test to conform with 2016.11 branch standards" 
This reverts commit 535b8e8d8e.
 2017-06-06 16:35:12 -06:00
Mike Place
c7f60312c8 Merge pull request #41591 from FireEater64/add-choco-no-progress-option 
Choco: Add support for the --no-progress option
 2017-06-06 17:30:53 -05:00
Ch3LL
0e35605f20
Skip git_pillar tests on MacOSX 2017-06-06 17:17:57 -04:00
Mike Place
20c54a984b Merge pull request #40694 from xetus-oss/boto_ec2_volume_present 
Boto ec2 volume present
 2017-06-06 16:03:25 -05:00
Mike Place
979f121791 Merge pull request #41575 from dschaller/fix-41562 
Fix 41562
 2017-06-06 16:00:46 -05:00
Mike Place
8f9ba1f258 Merge pull request #41615 from Ch3LL/fix_mac_clock 
Fix get_hwclock_aix test on MacOSX
 2017-06-06 15:52:32 -05:00
Mike Place
94aa1876d4 Merge pull request #41546 from cloudflare/dns-grains 
Add host_dns grain for napalm
 2017-06-06 15:00:07 -05:00
Mike Place
e3dc585d01 Merge pull request #41607 from cloudflare/more-nitrogen-docs 
Index new modules introduced in Nitrogen
 2017-06-06 14:54:31 -05:00
Mike Place
4aadfc2d0e Merge pull request #41600 from rallytime/vultr-py3 
Fix vultr cloud driver to work with Python 3
 2017-06-06 14:52:02 -05:00
garethgreenaway
02f7a7d751 Merge pull request #41609 from gtmanfred/nitrogen 
load source files as binary
 2017-06-06 12:41:03 -07:00
Daniel Wallace
b25b487ceb create home directory for issue-1959 
Fixes https://github.com/saltstack/salt-jenkins/issues/388
 2017-06-06 13:32:57 -06:00
Ch3LL
ea147701f4
Fix get_hwclock_aix test on MacOSX 2017-06-06 15:06:08 -04:00
rallytime
1a40e105e5 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - tests/integration/__init__.py
  - tests/integration/modules/test_state.py
 2017-06-06 12:57:44 -06:00
rallytime
2cb4f2baa9 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/states/keystone.py
 2017-06-06 12:50:35 -06:00
garethgreenaway
2fc700accf Merge branch 'develop' into fix-41562 2017-06-06 11:47:00 -07:00
Mike Place
936484026b Merge pull request #41543 from cri-epita/develop 
Fix user creation with empty password
 2017-06-06 13:27:16 -05:00
Mike Place
846ca54688 Merge pull request #41552 from Enquier/neutron-floatingip-remove 
Adding logic so that update_floatingip can dissassociate floatingip's
 2017-06-06 13:25:55 -05:00
Mike Place
53ecb5c4b0 Merge pull request #41553 from terminalmage/issue41527 
Fix installing RPMs via remote URLS which are 30x redirects
 2017-06-06 13:23:41 -05:00
Mike Place
36b2eee8f7 Merge pull request #41554 from KevinPlus3/add_chattr 
Add chattr functionality.
 2017-06-06 13:22:37 -05:00
Daniel Wallace
fd23f7dad3 Mark known flaky mac power test 2017-06-06 12:19:45 -06:00
Mike Place
b720ecb732 Merge pull request #41569 from gtmanfred/fix_test_result_check 
Check all entries in result
 2017-06-06 13:18:16 -05:00
Mike Place
d9546c6283 Merge pull request #41599 from garethgreenaway/41540_fixes_to_archive_module 
Fixes to modules/archive.py
 2017-06-06 13:02:13 -05:00
garethgreenaway
b260b5f380 Merge branch 'develop' into add-choco-no-progress-option 2017-06-06 10:30:05 -07:00
garethgreenaway
adf249eb74 Merge branch 'develop' into boto_ec2_volume_present 2017-06-06 10:28:14 -07:00
garethgreenaway
bd6af111e3 Merge pull request #41608 from Ch3LL/fix_mac_user_test 
Disable home dir check for mac in test_user
 2017-06-06 10:25:49 -07:00
garethgreenaway
10ac80ee96 Merge pull request #41453 from peter-funktionIT/fix_win_pki_state_import_cert 
Update win_pki.py
 2017-06-06 10:15:54 -07:00
Mike Place
420c0bd338 Merge pull request #41610 from terminalmage/py3-tests 
Even more debug logging for manage runner tests
 2017-06-06 12:15:42 -05:00
Erik Johnson
8d85d7a898 Even more debug logging for manage runner tests 
This will show whether or not the test.ping was actually received by the
minion, and whether or not the minion attempted to send the return back
to the master.
 2017-06-06 12:14:08 -05:00
garethgreenaway
3335fcbc7d Merge pull request #41557 from dmurphy18/fix-proxy-service 
Add symbolic link for salt-proxy service similar to other serivce files
 2017-06-06 10:13:51 -07:00
garethgreenaway
f6bd970ce6 Merge branch 'develop' into develop 2017-06-06 10:09:13 -07:00
garethgreenaway
872ba1f8ed Merge branch 'develop' into add_chattr 2017-06-06 10:07:25 -07:00
garethgreenaway
0685d72e3a Merge pull request #41601 from rallytime/remove_urlencode 
[PY3] Remove uses of urllib.urlencode for PY3 - use six instead
 2017-06-06 10:05:53 -07:00
Daniel Wallace
53d0098f47 load source files as binary 
If we load them as text on a system without an locale setup, (so it defaults to
C or POSIX), then no modules/states with unicode in the documentation can be
loaded.
 2017-06-06 10:35:38 -06:00
Mircea Ulinic
564f2d1e3d Indent correctly the code block 2017-06-06 15:23:14 +00:00
Ch3LL
8d27bb31b2
Disable home dir check for mac in more test_user tests 2017-06-06 11:20:18 -04:00
Nicole Thomas
65ed230f45 Merge pull request #41597 from rallytime/bp-41533 
Back-port #41533 to 2016.11
 2017-06-06 09:15:09 -06:00
Mircea Ulinic
b70df6e576 Reference new Jinja filters in the release notes 2017-06-06 15:15:06 +00:00
Mircea Ulinic
406e582479 Small adjustment 2017-06-06 15:14:47 +00:00
rallytime
27892a85c7 Lint fix 2017-06-06 09:12:14 -06:00
Nicole Thomas
bd767f77f9 Merge pull request #41588 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-06-06 09:08:22 -06:00
Mircea Ulinic
62cb2a1c7a More jinja references 2017-06-06 15:05:50 +00:00
Ch3LL
85e77c9cc8
Disable home dir check for mac in test_user 2017-06-06 11:02:19 -04:00
Mircea Ulinic
bba8c27873 Restructure the Jinja topic to have refrences 2017-06-06 14:56:21 +00:00
Nicolas Geniteau
f7bf038a91 Fix user creation with empty password 
Emptying the password was only done if the user already existed, not
when creating.

Signed-off-by: Nicolas Geniteau <nicolas@cri.epita.net>
 2017-06-06 14:51:08 +00:00
Erik Johnson
4607c7b7cc Merge pull request #41606 from terminalmage/py3-tests 
Modify debug logging for manage runner troubleshooting
 2017-06-06 09:34:15 -05:00