Gareth J. Greenaway
373b8d8803
Updated to managing schedule code. Adding ability to enable, disable scheduler completely on a minion. Also the ability to enable and disable particular jobs on minions. Updating add_job to match with another commit
2014-06-05 19:18:08 -07:00
Joseph Hall
8993802f4f
Merge pull request #13280 from sjansen/patch-1
...
fix yaml errors in cloud map documentation
2014-06-05 19:45:05 -06:00
Stuart Jansen
b4e9405cf4
fix yaml errors in cloud map documentation
2014-06-05 19:34:13 -06:00
Pedro Algarvio
b665a019e1
Merge pull request #13274 from s0undt3ch/hotfix/lint
...
Stop complaining about PEP8 E265
2014-06-06 01:14:43 +01:00
Pedro Algarvio
238690176f
Stop complaining about PEP8 E265
2014-06-06 01:13:48 +01:00
Thomas S Hatch
6e6a8dbebf
Merge pull request #13271 from basepi/yamlindentation
...
Clarify yaml indentation issues, and add another example
2014-06-05 17:33:28 -06:00
Colton Myers
3c3bc18068
Clarify yaml indentation issues, and add another example
2014-06-05 17:20:53 -06:00
Thomas S Hatch
fdb4102f7e
Merge pull request #13269 from s0undt3ch/hotfix/lint
...
Lint fixes + no hardcoded paths
2014-06-05 17:13:39 -06:00
Thomas S Hatch
7f43a6d5f7
Merge pull request #13261 from cachedout/10275
...
Detection of __salt__ in loader
2014-06-05 17:13:08 -06:00
Pedro Algarvio
7078250842
Fix variable name
2014-06-06 00:04:24 +01:00
Pedro Algarvio
7aaa3295df
Remove trailing white-sapce
2014-06-06 00:03:39 +01:00
Pedro Algarvio
15661f7d22
Don't hard code paths
2014-06-06 00:02:54 +01:00
Pedro Algarvio
3db15dde60
Remove extra space
2014-06-06 00:01:13 +01:00
Pedro Algarvio
ee6e85f98f
Fix indentation
2014-06-06 00:00:12 +01:00
Pedro Algarvio
da4bc736b4
Fix missing line lint issue
2014-06-05 23:59:29 +01:00
Pedro Algarvio
4dcf9980ff
Remove trailing white-space
2014-06-05 23:58:48 +01:00
Thomas S Hatch
0029693d86
Merge pull request #13268 from basepi/requisitedocs
...
More requisite doc cleanup
2014-06-05 16:45:50 -06:00
Thomas S Hatch
daba2ff4d8
Merge pull request #13267 from d--j/patch-2
...
Copy&Paste error in error message
2014-06-05 16:43:25 -06:00
Colton Myers
426ebcbc4d
More requisite doc cleanup
2014-06-05 16:24:59 -06:00
Mike Place
5e17059c68
Problem was actually with the ext grains. Doh!
2014-06-05 16:23:52 -06:00
Daniel Jagszent
de72a20a19
Copy&Paste error
...
It's `timeout` not `tmo` in this if clause.
2014-06-05 23:34:32 +02:00
Mike Place
c1cd9c1934
This time I banged my head on the table extra-hard.
2014-06-05 15:31:08 -06:00
Mike Place
9589ebf254
Fix broken tests
2014-06-05 14:45:59 -06:00
Thomas S Hatch
ea1e695608
Remove crypt code that accepts multiple master keys per PR #13143
2014-06-05 14:43:31 -06:00
Thomas S Hatch
fb5924070f
Merge pull request #13143 from felskrone/minion_failover_master
...
Minion failover master
2014-06-05 14:41:27 -06:00
Thomas S Hatch
90ccf67f44
Merge pull request #13262 from e1337h4xx/develop
...
Update debian.rst
2014-06-05 14:26:58 -06:00
Samuel Smith
1d024747ed
Merge pull request #13264 from SmithSamuelM/sam_raet_43
...
Fixed issues with Yard persistence
2014-06-05 14:14:40 -06:00
Samuel M Smith
bb925bee2b
Merge remote-tracking branch 'upstream/develop' into sam_raet_43
2014-06-05 14:08:09 -06:00
e1337h4xx
389a7677b0
Update debian.rst
...
Added jessie to saltstack debian installation docs
2014-06-05 22:01:53 +02:00
Samuel M Smith
73b5a3ca54
Make event based LaneStacks have unique names so there are no collisions
2014-06-05 13:59:39 -06:00
Mike Place
e91c23d494
Fix loader condition
2014-06-05 13:57:00 -06:00
Mike Place
b8d0842fe1
Detection of __salt__ in loader
...
This resolves #10275
It appears that there was an issue where in, __salt__ defined outside
of a function in a custom grain would be overwritten by the loader
when the grain was loaded.
The old logic overwrote __salt__ if it was not present in the pack,
regardless of whether or not it was an attribute of the module being
evaluated. I don't believe this is what was intended but there's
certainly a case I could be missing.
Should probably let tests run here before merging.
2014-06-05 13:26:32 -06:00
Samuel M Smith
6b34d360be
Added lane stack closer to workers
2014-06-05 13:17:21 -06:00
Samuel M Smith
91c81ac580
Added unique stack name to the manor lane and worker lane stacks to avoid conflicts with lane persistence
2014-06-05 13:08:45 -06:00
Thomas S Hatch
05da896bf0
Merge pull request #13257 from terminalmage/issue13185
...
A couple of gitfs fixes
2014-06-05 12:38:01 -06:00
Thomas S Hatch
22edf47d41
Merge pull request #13256 from garethgreenaway/control_scheudle
...
Adding ability to manage schedule from a salt module
2014-06-05 12:37:13 -06:00
Gareth J. Greenaway
a144f1dd6b
added missing versionadded string
2014-06-05 11:31:27 -07:00
Thomas S Hatch
89f74b83da
Merge pull request #13252 from smallfish/develop
...
Update salt/modules/yumpkg.py, yum install support branch parameter
2014-06-05 12:23:19 -06:00
Thomas S Hatch
b727a0b8f3
Merge pull request #13248 from daniel-yavorovich/develop
...
Added support for password-less login in user statement
2014-06-05 12:19:29 -06:00
Thomas S Hatch
1218386285
Merge pull request #13240 from jeremy-clerc/develop
...
kmod. Replace dash from available kernel modules by underscores
2014-06-05 12:18:34 -06:00
Thomas S Hatch
8cc6b41f94
Merge pull request #13214 from s0undt3ch/hotfix/hardcoded-test-paths
...
No hardcoded config test paths + Run fileserver tests
2014-06-05 12:17:09 -06:00
Daniel Yavorovych
37eac84d3e
fix trailing-whitespace
2014-06-05 19:52:55 +03:00
Erik Johnson
9dd8a51a8b
Strip trailing path separators from gitfs_root
2014-06-05 11:48:41 -05:00
Erik Johnson
0e25f0f8a6
Clear file_lists caches on master start
...
The caches do expire quickly (30 sec by default), but if you make a
config change, then quickly restart the master, the caches will still be
younger than the expiry deadline. This commit clears all file lists
caches on master start to ensure that they are properly generated in the
first loop interval.
2014-06-05 11:45:49 -05:00
Gareth J. Greenaway
d52cdfb1e7
fixing lint issues
2014-06-05 09:39:40 -07:00
Gareth J. Greenaway
c51718b8bc
Adding ability to manage schedule from a salt module, including the
...
ability to add new jobs, modify and delete existing jobs, list current
jobs, purge all jobs from the schedule and save the current jobs to a
file under the default minion include location.
2014-06-05 09:30:29 -07:00
Daniel Yavorovych
699d5c3ed8
fix comment block
2014-06-05 19:20:16 +03:00
Samuel Smith
d87e10c5ae
Merge pull request #13254 from SmithSamuelM/sam_raet_42
...
Changed ServiceAll to ServiceAllTx or ServiceAllRx respectively in Tx and Rx behaviors
2014-06-05 09:47:43 -06:00
Samuel M Smith
59efc05d40
Merge remote-tracking branch 'upstream/develop' into sam_raet_42
2014-06-05 09:42:20 -06:00
Samuel M Smith
691f000fe1
Changed Rx and Tx behaviors to ServiceAllRx and ServiceAllTx from ServiceAll to reduce unnecessary
...
queue checks
2014-06-05 09:40:27 -06:00
