Thomas S Hatch
a41b20fb9c
Merge pull request #19868 from rupeshta/glance_unit_tests
...
implemented unit test cases for glance module
2015-01-20 16:09:34 -07:00
Thomas S Hatch
c49361a1f0
Merge pull request #19863 from jayeshka/djangomod-unit-test
...
adding djangomod unit test case
2015-01-20 16:06:35 -07:00
Thomas S Hatch
dca509eb0d
Merge pull request #19859 from twellspring/develop
...
Documentation fix for Issue 19513.
2015-01-20 16:06:03 -07:00
Thomas S Hatch
cfb6befae4
Merge pull request #19858 from RyPeck/develop
...
Update timeout help to indicate it is in seconds
2015-01-20 16:04:47 -07:00
Thomas S Hatch
97c1757678
Merge pull request #19857 from mirath/state_output_diff_cmdflag
...
Added a cmd flag for the state_output_diff variable
2015-01-20 16:04:30 -07:00
Thomas S Hatch
b489dfa8c7
Merge pull request #19855 from colincoghill/develop
...
Fix for docker login saltstack/salt#18673
2015-01-20 16:00:20 -07:00
Thomas S Hatch
32f062d8e7
Merge pull request #19851 from rominf/linux_acl_mask
...
[linux_acl] add mask support
2015-01-20 15:59:40 -07:00
Thomas S Hatch
7ea840fbe1
Merge pull request #19829 from AlexanderHaase/develop
...
Fix for issue #17198
2015-01-20 15:43:14 -07:00
Samuel Smith
f2317b0557
Merge pull request #19888 from SmithSamuelM/sam_20150120
...
Added local test runner for salt daemons on raet unittests
2015-01-20 15:16:06 -07:00
Samuel M Smith
7a2ff7f008
added lint exceptions
2015-01-20 15:14:24 -07:00
Samuel M Smith
5fe6b16081
Added local test runner for daemons raet unit tests
2015-01-20 15:06:23 -07:00
Samuel M Smith
b24e32699d
Merge remote-tracking branch 'upstream/develop' into sam_20150120
2015-01-20 14:59:09 -07:00
Samuel Smith
53d003cc3c
Merge pull request #19844 from DSRCompany/raet_presence_test
...
Don't run deeds in SetUp, use enter and recur.
2015-01-20 14:58:31 -07:00
Thomas S Hatch
8bfb79c8d9
Merge pull request #19812 from matthew-muscat/develop
...
Update hosts file creation for consistency and improved readability
2015-01-20 14:52:01 -07:00
Samuel M Smith
c0fbaa10ff
Merge remote-tracking branch 'upstream/develop' into sam_20150120
2015-01-20 14:45:59 -07:00
Samuel M Smith
0a014dfb2c
fix pedro bug
2015-01-20 14:45:23 -07:00
Thomas S Hatch
6d126d6014
Merge branch '2015.2' into develop
2015-01-20 14:42:47 -07:00
Thomas S Hatch
ef8e457360
Merge pull request #19886 from thatch45/pedro_doh
...
@s0undt3ch copy pasta breaks pillar!
2015-01-20 14:41:32 -07:00
Thomas S Hatch
c2be438803
@s0undt3ch copy pasta breaks pillar!
2015-01-20 14:40:20 -07:00
Samuel M Smith
068c5a710c
Merge remote-tracking branch 'upstream/develop' into sam_20150120
2015-01-20 13:58:26 -07:00
Thomas S Hatch
b0d4fa1f5a
Merge pull request #19883 from thatch45/pillar_error
...
Add an error to the master log for failed pillar builds
2015-01-20 13:58:01 -07:00
Thomas S Hatch
653aa4686f
Add an error to the master log for failed pillar builds
2015-01-20 13:56:34 -07:00
Samuel M Smith
923e062ef1
Fixed problems when aes not setup on conventional minion not one meant for multi-headed
2015-01-20 11:47:53 -07:00
Samuel M Smith
0c65488456
Merge remote-tracking branch 'upstream/develop' into sam_20150120
2015-01-20 11:14:56 -07:00
Samuel M Smith
6b81e2a38f
Fixed reference. Someone moved where the Minion daemon class was defined
2015-01-20 11:12:00 -07:00
Thomas S Hatch
89ef86096c
Merge pull request #19814 from thatch45/mkey_cli
...
Mkey cli
2015-01-20 10:22:09 -07:00
Rupesh Tare
87eba66086
implemented unit test cases for glance module
2015-01-20 18:05:09 +05:30
Jayesh Kariya
346eb73f5c
adding djangomod unit test case
2015-01-20 15:21:21 +05:30
twellspring
e62e36dd57
Update include.rst
2015-01-19 21:02:26 -08:00
twellspring
59c67479ca
Create sls_filename_cant_contain_period.rst
2015-01-19 20:56:49 -08:00
twellspring
cb2bfd6921
Update states_pt1.rst
2015-01-19 20:46:03 -08:00
twellspring
b78dff7011
Update starting_states.rst
2015-01-19 20:19:23 -08:00
Alexander Haase
42af1e10ce
Another pass over modules/mount.py against pylint....
2015-01-19 20:04:48 -05:00
Alexander Haase
aac56b1443
Another pass over modules/mount.py against pylint....
2015-01-19 19:08:28 -05:00
Ryan Peck
1c53dc306b
Update timeout help to indicate it is in seconds
2015-01-19 18:42:44 -05:00
German Jaber
5dec2aadc7
Merge branch 'develop' of https://github.com/saltstack/salt into state_output_diff_cmdflag
2015-01-19 19:03:19 -04:30
German Jaber
7032006a4f
Added a cmd flag for the state_output_diff variable
2015-01-19 19:01:15 -04:30
Alexander Haase
cc2b03d7ab
Merge https://github.com/saltstack/salt into develop
2015-01-19 18:15:02 -05:00
Alexander Haase
35e690a33d
More pylint fixes for changes to modules/mount.py
2015-01-19 18:14:37 -05:00
Colin Coghill
f4c7a6bf3f
Fix for docker login saltstack/salt#18673
2015-01-20 11:51:12 +13:00
Alexander Haase
3e252cf9c4
PEP style compliance for changes to states/mount.py
2015-01-19 17:35:54 -05:00
Alexander Haase
810e1ceeba
PEP style compliance for changes to modules/mount.py
2015-01-19 17:34:32 -05:00
Alexander Haase
6a0906df45
Updating modules/mount.py (mount.fstab) to produce an array for opts, rather than the opts string literal. Allows mount to pass unit tests
2015-01-19 16:46:57 -05:00
Roman Inflianskas
8b0e6fa2cd
[states/linux_acl] add mask support
2015-01-19 21:34:43 +03:00
Roman Inflianskas
924243247f
[modules/linux_acl] add mask support
2015-01-19 21:27:19 +03:00
Dmitry Kuzmenko
ed1e87eaf7
Don't run deeds in SetUp, use enter and recur.
...
Presence test update:
1. Don't run deeds in test SetUp method.
2. Don't use benter. Use enter and recur instead.
3. Removed useless returns from actors (erroneously added before).
2015-01-19 16:35:01 +03:00
Joseph Hall
5f00166315
Merge pull request #19831 from TronPaul/iptables_bang_not_fix
...
Fix iptables regex issue
2015-01-18 07:51:21 -07:00
Alexander Haase
acb87f33e2
Fixed whitespace error, ran unit tests
2015-01-18 09:36:20 -05:00
Alexander Haase
4e4c10cd16
Merge https://github.com/saltstack/salt into develop
2015-01-18 09:08:22 -05:00
Mark McGuire
4910822280
fix regex issue
2015-01-18 00:11:35 -06:00
