valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
19,556 Commits 24 Branches 182 Tags 341 MiB
9a4837dd8a
Commit Graph

19556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Boucha
9a4837dd8a Add Windows installer 0.17.1.1 release 2013-10-28 18:33:36 -06: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
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
Henrik Holmboe
ab818515de If there is no hit, don't log just return None 2013-10-28 11:43:26 +01:00
Henrik Holmboe
33945a8421 Use PATHEXT in salt.utils.which on Windows 
Fixes #8125.
 2013-10-28 11:42:00 +01:00
David Boucha
3d29e9b127 Merge pull request #8131 from UtahDave/develop 
Add space to make pylint happy
 2013-10-27 15:53:47 -07:00
David Boucha
45fdf94373 Add space to make pylint happy 2013-10-27 16:52:47 -06:00
Thomas S Hatch
52cf123bdc Merge pull request #8130 from UtahDave/develop 
Properly determine conf_dir
 2013-10-27 15:49:37 -07:00
David Boucha
b450f2ea86 Properly determine conf_dir 
lstrip() strips each char independently. Not the whole string as a whole
 2013-10-27 16:36:25 -06:00
Thomas S Hatch
b7f8fdb299 Merge pull request #8129 from terminalmage/which-test 
Add a test for salt.utils.which
 2013-10-27 15:33:42 -07:00
Erik Johnson
ab2891cd97 Merge branch 'features/mocked-which-test' of https://github.com/s0undt3ch/salt into s0undt3ch-features/mocked-which-test 2013-10-27 17:25:45 -05:00
Erik Johnson
22f278b8b4 Add unit test for salt.utils.which 
This is a Linux-only test, it will need some mock love to make it
suitable to test for windows paths.
 2013-10-27 17:18:34 -05:00
Thomas S Hatch
d5eec7edc1 Merge pull request #8128 from asachs/develop 
Fix setting rabbitmq users tags and permissions
 2013-10-27 15:04:44 -07:00
Andre Sachs
e33900568d Fix a the return from setting a rabbitmq users tag, this was failing 
religiously due to the lack of tabs in the output.

Fix the documentation for the perms attribute (was permissions).

Fix the perms handling, as it is a list of dicts that is called in.
 2013-10-27 23:08:41 +02:00
Dane Knecht
889dc413df Ensure that the variable candidate is referenced 
before assignment
 2013-10-27 12:49:58 -07:00
Pedro Algarvio
c8c6dab678 Add some comments to explain whats going on. 2013-10-27 16:53:39 +00:00
Pedro Algarvio
79391f107b Provide a mocked version the tests to reach windows specific code. 2013-10-27 16:53:39 +00:00
Erik Johnson
a9d1c12481 Add unit test for salt.utils.which 
This is a Linux-only test, it will need some mock love to make it
suitable to test for windows paths.
 2013-10-27 16:53:39 +00:00
Joseph Hall
e111b2527d Merge pull request #8124 from techhat/webutils 
Move out htpasswd functions into webutil module
 2013-10-27 07:15:16 -07:00
Joseph Hall
af9c07a465 Move out htpasswd functions into webutil module 2013-10-27 08:12:00 -06:00
Pedro Algarvio
98066aaa1d Merge pull request #8121 from terminalmage/issue7904 
Make salt.utils.which look for a path with .exe on Windows
 2013-10-26 21:14:38 -07:00
Erik Johnson
03abf61672 Optimization for .exe path check 
The majority of minions will be running a non-Windows OS, so this tweak
keeps salt.utils.is_windows() from being run unless the non-.exe path
check fails.
 2013-10-26 23:11:03 -05:00
Erik Johnson
e8f17b2f0e Make salt.utils.which look for a path with .exe on Windows 
If the argument passed to this function does not end in .exe and the
minion is running Windows, look for the path + '.exe', allowing both
'cmd.exe' and 'cmd' to be matched.
 2013-10-26 21:04:53 -05:00
Thomas S Hatch
962b99693e Merge pull request #8117 from s0undt3ch/develop 
Loader Test Cases
 2013-10-26 13:05:04 -07:00
Thomas S Hatch
cbb24b4602 Merge pull request #8101 from hvnsweeting/pkgrepo_refactor 
remove unecessary dict, use other way to remove keys
 2013-10-26 13:02:41 -07:00
Joseph Hall
7aed73f5bc Merge pull request #8116 from holmboe/compat-etree 
Use ElementTree from salt._compat
 2013-10-26 11:17:46 -07:00
Pedro Algarvio
4b46ee5017 Remove unnecessary imports. 2013-10-26 18:59:44 +01:00
Pedro Algarvio
f96c01738e Provide the loader integration tests in it's own package. 2013-10-26 18:57:00 +01:00
Pedro Algarvio
3bedf7c751 Some more tests within the test case. 2013-10-26 18:45:21 +01:00
Pedro Algarvio
ce553415cc Provide test case to prove proper loader function override. Refs #8096. 2013-10-26 18:06:28 +01:00
Henrik Holmboe
3eda9cec55 This has to be an unnoticed bug? 2013-10-26 18:56:10 +02:00
Henrik Holmboe
bf8ac65994 Use ET from _compat in s3.py 2013-10-26 18:51:16 +02:00
Henrik Holmboe
c0aecc7c4b Use ElementTree from salt.utils._compat 
Also remove duplicate import of ElementTree.
 2013-10-26 18:46:17 +02:00
Thomas S Hatch
db2e4758fd Merge pull request #8103 from cachedout/#7755 
First pass at some file-locking and retry logic for file hashes. Also a ...
 2013-10-25 21:35:15 -07:00
Pedro Algarvio
59753940bf Merge pull request #8112 from terminalmage/issue8102 
Fix kwargs containing dashes
 2013-10-25 18:13:32 -07:00