valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
19,691 Commits 24 Branches 182 Tags 341 MiB
05b8d3d50c
Commit Graph

19691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
b433d0368f Work around windows multiprocessing bug 
Set __opts__['test'] back to it's prior value at the end of the various
functions in salt.modules.state which use it.
 2013-10-29 17:53:04 -05:00
Thomas S Hatch
cd2b161ac8 Merge pull request #8161 from halfgaar/develop 
Added : to xen grep, because otherwise it would match kernel messages li...
 2013-10-29 15:36:17 -07:00
Thomas S Hatch
561659036c Merge pull request #8120 from davidjb/develop 
Allow noarch packages to be found for yum installation.
 2013-10-29 15:35:13 -07:00
Thomas S Hatch
b5960da8a6 Merge pull request #8106 from zeezooz/fix_mine_timeout 
Use non-zero timeout in mine.update method and don't ignore exceptions.
 2013-10-29 15:22:32 -07:00
Thomas S Hatch
b04f9c4ae2 Merge pull request #8160 from johnnoone/hide-with-statement-warnings 
Hide with-statements warnings
 2013-10-29 13:58:23 -07:00
Colton Myers
a29bb6128e Merge pull request #8154 from gravyboat/develop 
An additional example, and details on the template option for file.recurse.
 2013-10-29 12:32:22 -07:00
Colton Myers
b98f5f4acd Merge pull request #8147 from terminalmage/docs 
Improve git_pillar docs
 2013-10-29 12:29:13 -07:00
David Boucha
e64792c9d6 Merge pull request #8166 from nshalman/freezer_fixes 
Add 'email' and 'email.mime.*' to all esky builds
 2013-10-29 11:32:01 -07:00
Nahum Shalman
5079d271fb Add 'email' and 'email.mime.*' to all esky builds 
Fixes "ImportError: No module named audio" on SmartOS

Uses 'email.mime.*' rather than a full list of entries.

Also removes a duplicate entry for 'fileinput' from the
windows section that was added to the main FREEZER_INCLUDES

Email thread that suggested this fix:
https://groups.google.com/forum/#!msg/salt-users/_9ynHspSgjk/so0hRdbaPM0J

Tested as a fix to a 0.17.1 checkout on SmartOS.
 2013-10-29 14:24:45 -04:00
Pedro Algarvio
dafa4a2319 Merge pull request #8164 from terminalmage/issue8067 
Fix pkg.latest regression in apt
 2013-10-29 10:56:37 -07:00
Erik Johnson
4e97a2d018 Fix pkg.latest regression in apt 
The recent changes to disable the use of shell=True in cmd.run* calls
mean that the repo argument no longer needs to be quoted.
 2013-10-29 12:11:09 -05:00
Pedro Algarvio
d4c8bda683 Merge pull request #8148 from basepi/fcntltypo 
Fix typo (fcntl, not fnctl)
 2013-10-29 10:02:18 -07:00
Pedro Algarvio
42ccf894b0 Merge pull request #8150 from terminalmage/issue7601 
cmd.script fix: don't try to run script when caching fails
 2013-10-29 10:01:29 -07:00
Pedro Algarvio
8e2f91f1ed Merge pull request #8158 from mekstrem/patch-1 
Update conf.py
 2013-10-29 09:59:37 -07:00
Mike Place
6cf66d8d0c Merge pull request #8155 from malinoff/fix-gpgkey-fail 
Fix apt-key silently fails
 2013-10-29 08:31:19 -07:00
Erik Johnson
ef70d2107b Add versionadded directive to augeas state docstring 2013-10-29 10:24:58 -05:00
Wiebe Cazemier
6b226535b5 Added : to xen grep, because otherwise it would match kernel messages like: skipping TxEn test for device [8086:108f] subsystem [8086:0000] 2013-10-29 11:33:23 +01:00
Xavier Barbosa
ce2adeb4e4 Hide with-statements warnings 2013-10-29 10:45:11 +01:00
mekstrem
c35fb3dfee Update conf.py 
Fixed typo.
 2013-10-29 09:13:07 +01:00
Dmitry Malinovsky
6dcee20258 Added right check and improved error message 2013-10-29 12:16:36 +07:00
Dmitry Malinovsky
7d5efa040b Added missing **kwargs 2013-10-29 12:16:17 +07:00
Forrest Alvarez
8ac2abf437 updated file.py with an additional file.recurse example, as well as a note stating that template is required as an option in file.recurse if you want templates within the recursive directories to be interpreted. 2013-10-29 05:02:15 +00:00
Joseph Hall
4ce9225af3 Merge pull request #8153 from terminalmage/issue6082 
Add warning about Debian/Ubuntu augeas packaging bug
 2013-10-28 19:04:27 -07:00
Erik Johnson
a3dd2cc355 Add warning about Debian/Ubuntu augeas packaging bug 
This adds a warning to the docstrings for both the augeas state and
execution module, explaining the issue discovered in #6082. For more
information, see the comments here:

https://github.com/saltstack/salt/issues/6082#issuecomment-27234356
 2013-10-28 20:58:06 -05:00
Joseph Hall
048176f662 Merge pull request #8149 from cloudflare/fix-parted-validation-errors 
Fix parted validation errors
 2013-10-28 18:23:25 -07:00
David Boucha
e745bd26a4 Merge pull request #8151 from UtahDave/develop 
Add Windows installer 0.17.1.1 release
 2013-10-28 17:34:26 -07:00
David Boucha
9a4837dd8a Add Windows installer 0.17.1.1 release 2013-10-28 18:33:36 -06:00
Erik Johnson
b8642d4474 cmd.script fix: don't try to run script when caching fails 
When 'template' resolves to True (the default behavior, since the
default value for this variable is 'jinja') the file is fetched using
cp.get_template. However, no checking was being done to see if the
caching of the script from the salt fileserver was successful, so when
caching fails, an empty tempfile is the result. This empty file is still
run as if it were a script.

This commit inserts a check to see if cp.get_template was successful,
and if not it returns the same error returned in other cache failures.

Additionally, when there was a cache failure, the tempfile allocated
at the start of the function was not being cleaned up, so this would
result in an empty file persisting in /tmp. These have been cleaned up
as well.
 2013-10-28 18:36:54 -05:00
Sebastien Pahl
c05126e892 start and end boundaries can be strings with a unit in parted module 2013-10-28 15:19:06 -07:00
Colton Myers
dc393131b8 Fix typo (fcntl, not fnctl) 2013-10-28 16:15:45 -06:00
Erik Johnson
4a8bd16787 Improve git_pillar documentation 
This adds a brief explanation of git_pillar to the gitfs walkthrough.
Even though they don't work the same, they do similar things for
file_roots and pillar_roots, and it bears mentioning.

Also, this adds a better explanation of how git_pillar works to the
top-level docstring for pillar/git_pillar.py.
 2013-10-28 17:09:38 -05:00
Erik Johnson
39ac48b444 Fix sphinx build errors 2013-10-28 17:09:11 -05:00
Colton Myers
7be4df6a3a Merge pull request #8126 from dknecht/develop 
Ensure that the variable candidate is referenced
 2013-10-28 14:53:27 -07:00
Sebastien Pahl
e39aad6a7a Fixed syntax error for all sets in the parted module 2013-10-28 14:37:38 -07:00
Joseph Hall
7311692be6 Merge pull request #8145 from holmboe/author-me 
Add myself to AUTHORS
 2013-10-28 13:59:56 -07:00
Henrik Holmboe
a115c036c0 Add myself to AUTHORS 2013-10-28 21:53:54 +01:00
Thomas S Hatch
9c40e55c54 Merge pull request #8139 from s0undt3ch/features/mocked-which-test 
Provide a default `PATHEXT` environment variable.
 2013-10-28 13:11:04 -07:00
Thomas S Hatch
3648ea4afb Merge pull request #8136 from holmboe/keyerror-tok 
Check if tok exists before use
 2013-10-28 13:10:27 -07:00
Pedro Algarvio
614a009cd0 Merge pull request #8143 from UtahDave/develop 
These modules are needed for frozen Windows builds
 2013-10-28 11:40:33 -07:00
David Boucha
4f247a635a These modules are needed for frozen Windows builds 2013-10-28 12:18:36 -06:00
Pedro Algarvio
e465c6f288 Merge pull request #8141 from cachedout/#7788 
Correctly evaluate the test kwarg when running a state.
 2013-10-28 10:44:19 -07:00
Mike Place
2701bf2013 Correctly evaluate the test kwarg when running a state. 2013-10-28 11:36:24 -06:00
David Boucha
e3703dcca3 Merge pull request #8138 from dangarthwaite/tweak_reactor_docs_2 
ReStructure doesn't req * to be escaped in blockquotes.
 2013-10-28 09:42:52 -07:00
Pedro Algarvio
798e1830d5 Provide a default PATHEXT environment variable. 
Added test case which relies on the `PATHEXT` environment variable.
 2013-10-28 16:05:19 +00:00
Dan Garthwaite
eb85b12153 ReStructure doesn't req * to be escaped in blockquotes. 2013-10-28 11:55:31 -04:00
Pedro Algarvio
96af5768fb Merge pull request #8133 from holmboe/which-pathext 
Use PATHEXT in salt.utils.which on Windows
 2013-10-28 08:45:16 -07:00
Joseph Hall
4da2505dcb Merge pull request #8137 from dangarthwaite/tweak_reactor_docs 
Tying tags and events to state files wasn't clear to me.
 2013-10-28 08:44:58 -07:00
Dan Garthwaite
ff242cc482 Tying tags and events to state files wasn't clear to me. 
Also some typoes and escaping '*' chars.
 2013-10-28 11:43:59 -04:00
Henrik Holmboe
6db2860a29 Fix copy-paste error 2013-10-28 16:21:53 +01:00
Henrik Holmboe
d3c254a0c2 Check if tok exists before use 
The problem is described in #8078 and was introduced in 151759b.

I am not super happy with the solution here. It seems that checks for
required `load` keys are done differently all over master.py. The reason
why I choose to check for `tok` separately was to be able to pinpoint
which minions have not been upgraded to 0.17.1.

Moving forward the checks for `id`, `data`, `tgt`, `fun`, etc could be
logged the same way, if appropriate.
 2013-10-28 16:15:32 +01:00