valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
47,715 Commits 24 Branches 182 Tags 341 MiB
5504778adf
Commit Graph

47715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Boucha
5504778adf update to proper examples 2015-05-07 18:08:05 +00:00
David Boucha
6890439d58 fix list for mask 2015-05-07 18:08:05 +00:00
David Boucha
ee7b579e90 remove custom interval code. 
The beacon subsystem provides this now.
 2015-05-07 18:08:05 +00:00
Justin Findlay
1fd0bc2011 Merge pull request #23438 from techhat/gaterequests 
Gate requests import
 2015-05-07 01:22:58 -06:00
Colton Myers
3c4f734332 Merge pull request #23429 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-05-06 23:35:13 -06:00
Joseph Hall
d5b15fc6ce Gate requests import 2015-05-06 22:49:11 -06:00
Colton Myers
7729834d92 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    salt/client/ssh/wrapper/__init__.py
 2015-05-06 15:45:11 -06:00
Colton Myers
1fb84450f4 Merge pull request #23396 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-05-06 15:42:35 -06:00
C. R. Oldham
644eb75fec Merge pull request #23422 from cro/gce_sh_home 
$HOME should not be used, some shells don't set it.
 2015-05-06 15:02:36 -06:00
Colton Myers
ef17ab4b2a Merge pull request #23425 from basepi/functionwrapper_typo 
[2014.7] Fix typo in FunctionWrapper
 2015-05-06 14:38:03 -06:00
Colton Myers
c390737f3e Fix typo in FunctionWrapper 2015-05-06 14:37:34 -06:00
Colton Myers
2766c8cb4b Fix typo in FunctionWrapper 2015-05-06 14:36:47 -06:00
C. R. Oldham
4ef9e6ba06 Don't use $HOME to find user's directory, some shells don't set it 2015-05-06 14:33:20 -06:00
Justin Findlay
1b13ec04c2 Merge pull request #23385 from rallytime/bp-23346 
Backport #23346 to 2014.7
 2015-05-06 14:12:29 -06:00
Justin Findlay
f8c7a62089 Merge pull request #23414 from jfindlay/update_branch 
2015.2 -> 2015.5
 2015-05-06 14:04:02 -06:00
Colton Myers
23d4feb8b4 Merge remote-tracking branch 'upstream/2015.2' into 2015.5 2015-05-06 13:51:10 -06:00
Justin Findlay
b3c16720f6 Merge pull request #23412 from rahulhan/states_win_update_unit_test 
Adding states/win_update.py unit tests
 2015-05-06 12:31:09 -06:00
Justin Findlay
8074d16d52 2015.2 -> 2015.5 
Related to https://github.com/saltstack/salt-windows-dev/pull/10.
 2015-05-06 11:40:01 -06:00
Seth House
54b3bd43e4 Merge pull request #23404 from hvnsweeting/cherrypy-post-emptybody-fix 
saltapi cherrypy: initialize var when POST body is empty
 2015-05-06 11:35:56 -06:00
Erik Johnson
d6b62f73a4 Update manpages to reflect 2015.2 rename to 2015.5 2015-05-06 11:13:13 -06:00
Erik Johnson
cc673b4a71 Fix missed docstring updates from 2015.2 -> 2015.5 2015-05-06 11:13:09 -06:00
Erik Johnson
a7447ac681 Add missing RST file 2015-05-06 11:13:05 -06:00
Colton Myers
f2d7646a58 Merge pull request #23413 from terminalmage/update-manpages 
Update manpages for 2015.2 -> 2015.5
 2015-05-06 11:12:57 -06:00
Erik Johnson
23fa4402dc Update manpages to reflect 2015.2 rename to 2015.5 2015-05-06 12:08:46 -05:00
Erik Johnson
0fdaa73c84 Fix missed docstring updates from 2015.2 -> 2015.5 2015-05-06 12:07:04 -05:00
Erik Johnson
4fea5ba477 Add missing RST file 2015-05-06 12:06:49 -05:00
Erik Johnson
0504e7a184 Update Lithium docstrings in 2015.2 branch 2015-05-06 11:01:53 -06:00
Colton Myers
8510a4c30e Update to release notes from 2015.2 branch 2015-05-06 10:48:06 -06:00
Colton Myers
3255fbc0d5 Rename the release notes 2015-05-06 10:47:16 -06:00
Colton Myers
ba3b782cb3 Rename 2015.2 to 2015.5 2015-05-06 10:39:17 -06:00
Colton Myers
edf6ebee21 Revert "Modified win_groupadd to use ADSI like win_useradd, added ability to manage AD users/groups via ADSI (keying off 'dc=' in username)" 
This reverts commit 714145d50b.
 2015-05-06 10:38:39 -06:00
Colton Myers
9d7dafbcf3 Revert "lint fixes" 
This reverts commit 44e7bf7b0c.
 2015-05-06 10:38:32 -06:00
Colton Myers
b3cf25a6d2 Revert "more lint fixes" 
This reverts commit 640864d92a.
 2015-05-06 10:38:26 -06:00
Colton Myers
fbeb8f4139 Revert "lint" 
This reverts commit 8a719fcb66.
 2015-05-06 10:38:18 -06:00
Rahul Handay
9bc1519ee7 Removed unwanted imports 2015-05-06 21:54:37 +05:30
Justin Findlay
160f703296 Merge pull request #23409 from terminalmage/update-lithium-docstrings-2014.7 
Update Lithium docstrings in 2014.7 branch
 2015-05-06 10:20:46 -06:00
Rahul Handay
f12bfcf248 Adding states/win_update.py unit tests 2015-05-06 21:45:41 +05:30
Justin Findlay
bafbea7bc7 Merge pull request #23410 from terminalmage/update-lithium-docstrings-2015.2 
Update Lithium docstrings in 2015.2 branch
 2015-05-06 09:53:52 -06:00
Justin Findlay
02ef41a549 Merge pull request #23407 from jayeshka/rsync-unit-test 
adding rsync unit test case
 2015-05-06 09:52:23 -06:00
Justin Findlay
58ec2a24c1 Merge pull request #23406 from jayeshka/lxc-states-unit-test 
adding states/lxc unit test case
 2015-05-06 09:51:50 -06:00
Erik Johnson
bc97d011ba Fix sphinx typo 2015-05-06 09:31:19 -05:00
Erik Johnson
d395565bf7 Update Lithium docstrings in 2015.2 branch 2015-05-06 09:27:40 -05:00
Erik Johnson
20006b06f6 Update Lithium docstrings in 2014.7 branch 2015-05-06 09:12:37 -05:00
Jayesh Kariya
a4dd836125 adding rsync unit test case 2015-05-06 17:31:04 +05:30
Jayesh Kariya
32a0d03093 adding states/lxc unit test case 2015-05-06 17:29:53 +05:30
Viet Hung Nguyen
f85f8f954c initialize var when POST body is empty 
or lowdata_fmt will raise exception
 2015-05-06 12:02:14 +07:00
Thomas S Hatch
aa5fb0aa46 Merge pull request #23397 from jfindlay/fix_locale_gen 
add more flexible whitespace to locale_gen search
 2015-05-05 21:44:10 -06:00
Justin Findlay
0941fefd2b add more flexible whitespace to locale_gen search 
Fixes #17245.
 2015-05-05 17:10:15 -06:00
Colton Myers
fd09cdae6f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/ssh/roster.rst
    salt/client/ssh/__init__.py
    salt/client/ssh/wrapper/__init__.py
    salt/config.py
    salt/modules/file.py
    salt/runners/lxc.py
 2015-05-05 16:26:39 -06:00
Colton Myers
8837d0038e Merge pull request #23395 from basepi/2015.2.0masteropts 
[2015.2] Add note to 2015.2.0 release notes about master opts in pillar
 2015-05-05 16:15:20 -06:00