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
Pedro Algarvio
ca9a5be2da
Merge pull request #13253 from IllegalWalker/fix-timeout-bug
...
Add unicode supportting for client timeout arg.
2014-06-05 16:33:37 +01:00
泓远
5977e901e4
Add unicode supportting for client timeout arg.
...
Salt-API passed unicode timeout arg to salt.client.LocalClient(),
causing timeout arg passed being invalid. This will fix it.
2014-06-05 23:13:18 +08:00
Pedro Algarvio
cf4a531e62
Fix ensure in syspath
2014-06-05 15:56:20 +01:00
Joseph Hall
2bf807ff3d
Merge pull request #13244 from gtmanfred/develop
...
fixes #13243
2014-06-05 05:52:01 -06:00
Pedro Algarvio
81b93dc944
Skip tests which need the empty_dir.
...
These will run perfectly fine with the upcoming salt-runtests.
2014-06-05 11:54:07 +01:00
Pedro Algarvio
c3fbe4fe98
The cachedir configuration option needs to be set.
2014-06-05 11:10:24 +01:00
smallfish
e497f602a4
Fix pylint for salt/log/handlers/sentry_mod.py, Trailing whitespace
2014-06-05 17:23:14 +08:00
Pedro Algarvio
c8466453a0
Wrap text
2014-06-05 10:10:56 +01:00
Pedro Algarvio
ccbf2ebfb6
No hardcoded paths. Provide required additional configuration options.
2014-06-05 10:10:56 +01:00
Pedro Algarvio
da42560286
When using integration.run_tests the SSH option is not available
2014-06-05 10:10:56 +01:00
Pedro Algarvio
649c7e6d01
Ensure proper path in syspath
2014-06-05 10:10:56 +01:00
Pedro Algarvio
57dd2da63e
Run the fileserver tests
2014-06-05 10:10:56 +01:00
Pedro Algarvio
d69bb5dfd9
No hard coded configuration paths
2014-06-05 10:10:56 +01:00
Pedro Algarvio
c4e47df943
Don't use the hardcoded path
2014-06-05 10:10:55 +01:00
Pedro Algarvio
bebddb9174
Don't use hardcoded paths
2014-06-05 10:10:55 +01:00
Pedro Algarvio
36ea569d0d
Don't use hard coded paths
2014-06-05 10:10:55 +01:00
Pedro Algarvio
afc446fded
Merge pull request #13245 from gtmanfred/pylint
...
fix pylint for sentry_mod
2014-06-05 10:06:50 +01:00
Daniel Yavorovych
dfeaa7dc18
refactoring del_password
2014-06-05 12:01:15 +03:00
smallfish
187b3bb130
Update salt/modules/yumpkg.py, yum install support branch parameter
2014-06-05 16:42:59 +08:00
Daniel Yavorovych
a7f81e85f6
add example block to shadow.del_password function
2014-06-05 11:10:27 +03:00
Pedro Algarvio
75d047580c
Merge pull request #13221 from s0undt3ch/hotfix/lint
...
Fix lint issues
2014-06-05 09:09:06 +01:00
Pedro Algarvio
9c618dd477
String formatting should be Py2.6 compatible(missed one). Refs #13218 .
2014-06-05 09:06:50 +01:00
Seth House
595e51f7b1
Merge pull request #13246 from whiteinge/doc-xetex-unicode-pdf
...
Added entry to docs Makefile and Sphinx config to build PDF usinx XeTeX
2014-06-04 19:50:25 -06:00
Daniel Yavorovych
02750e1cba
fix empty_password for user statement
2014-06-05 03:27:45 +03:00
Seth House
63dc40bd06
Added entry to docs Makefile and Sphinx config to build PDF usinx XeTeX
...
We have a few unicode chars in the docs now. Plus this should be a good
change for future non-English builds of the docs.
2014-06-04 17:44:10 -06:00
Daniel Wallace
d9a8214943
fixes #13243
2014-06-04 18:34:12 -05:00
Daniel Wallace
edeec50a38
fix pylint for sentry_mod
2014-06-04 18:34:12 -05:00
