Commit Graph

45083 Commits

Author SHA1 Message Date
Thomas S Hatch
c2be438803 @s0undt3ch copy pasta breaks pillar! 2015-01-20 14:40:20 -07:00
Seth House
76547b90ba Also catch TokenAuthenticationError tracebacks to properly raise a 401 2015-01-20 12:59:10 -08: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
Gareth J. Greenaway
9da62c4f1b removing logging statement. 2015-01-20 11:43:54 -08:00
Gareth J. Greenaway
b7d5bf57c2 Adding the StartTime to the output of the jobs.active runner. 2015-01-20 11:42:13 -08:00
Mike Place
b46e18c4be Fixup returner handling.
Closes #19807
2015-01-20 12:18:55 -07:00
Seth House
a5d22fb756 Added depends section to Azure cloud module docstring 2015-01-20 10:52:47 -08: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
twellspring
f7fc31e5dd Add how service is determined to be running/dead 2015-01-20 08:46:51 -08:00
Christian Fueller
74ff9aa530 fixes #19871 2015-01-20 16:48:56 +01:00
Flavian
b4213edbec Fixes #19597 2015-01-20 16:44:24 +01:00
Rupesh Tare
87eba66086 implemented unit test cases for glance module 2015-01-20 18:05:09 +05:30
Rupesh Tare
b18b1887f0 implemented unit test cases for module grub_legacy 2015-01-20 17:59:51 +05:30
Kevin Bowling
41263ffd9f Add FreeBSD support to ssds grain 2015-01-20 03:52:35 -07:00
Jayesh Kariya
346eb73f5c adding djangomod unit test case 2015-01-20 15:21:21 +05:30
Kevin Bowling
494543c5bc Add freebsdkmod changes to 2014.7.2 relnotes 2015-01-20 02:09:32 -07:00
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
Daniel Dye
fa764ea4aa BugFix 2015-01-18 12:58:41 -05: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
Ronald van Zantvoort
3d3b219047 Fix MTU setting in network.managed for RH systems 2015-01-18 15:49:51 +01: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
Alexander Haase
0a814d802a Normalizing white space to four spaces to remedy pylint errors 2015-01-18 00:04:35 -05:00
Alexander Haase
9de6fa595a Merge branch 'develop' of https://github.com/AlexanderHaase/salt into develop 2015-01-17 23:26:45 -05:00
Alexander Haase
9063ab330b Debugged & moderately tested match_on functionality for modules/mount and states/mount with relation to fstab. 2015-01-17 23:23:23 -05:00
Alexander Haase
660d24ff59 Debugged & moderately tested match_on functionality for modules/mount and states/mount with relation to fstab. 2015-01-17 23:10:33 -05:00
jfindlay
8133907a62 Merge pull request #19786 from jayeshka/defaults-unit-test
Adding defaults unit test case
2015-01-17 20:35:37 -07:00