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,843 Commits 24 Branches 182 Tags 341 MiB
4f00fa256b
Commit Graph

19843 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Seth House
4f00fa256b Fixed occurances of "Salt Stack" to SaltStack 2013-11-07 10:46:41 -07:00
Seth House
cf3df20aad Merge pull request #8323 from regilero/default-for-grains_filter_by 
Default for filter_by method in module grains
 2013-11-07 09:38:26 -08:00
Colton Myers
a59246a184 Merge pull request #8324 from terminalmage/minion-id-caching-fix 
Fix regression in minion ID caching
 2013-11-07 09:36:16 -08:00
Colton Myers
78662d270b Merge pull request #8325 from cachedout/#7860 
Add a dir_mode to file.managed
 2013-11-07 09:35:54 -08:00
Mike Place
2e6bf21635 Integration testing for file.managed dir_mode argument. 
Added documentation for dir_mode to file.managed.
 2013-11-07 10:19:16 -07:00
Colton Myers
79a1abf6f3 Merge pull request #8313 from gravyboat/develop 
Updated nodegroups and halite documentation.
 2013-11-07 09:11:06 -08:00
Erik Johnson
9e64e8d100 Fix regression in minion ID caching 
Some changes meant to fix minion ID caching in Windows caused a
regression in caching on *NIX OSes. This commit fixes that regression,
making minion ID caching work for all platforms.
 2013-11-07 10:40:43 -06:00
regilero
9dce9ac304 Add unit tests for grains.filter_by 2013-11-07 17:15:30 +01:00
regilero
dbfe790a2b Add a default option in grains.filter_by 2013-11-07 17:14:30 +01:00
David Boucha
2e79f4fc68 Merge pull request #8317 from UtahDave/develop 
pylint fixes.
 2013-11-07 01:23:39 -08:00
David Boucha
944f691d98 must have space on either side of assignment 2013-11-07 02:22:11 -07:00
David Boucha
5c124d757e remove extra whitespace 2013-11-07 02:21:35 -07:00
David Boucha
1628b17856 add utf-8 line 2013-11-07 02:21:01 -07:00
Joseph Hall
570e538886 Merge pull request #8316 from holmboe/pylint-and-comments 
In-line comments and typos
 2013-11-07 01:10:13 -08:00
Henrik Holmboe
043f9bf85a Fix typos 2013-11-07 10:06:37 +01:00
Joseph Hall
4a81ac8d74 Merge pull request #8315 from scott-w/develop 
Initial SQS implementation
 2013-11-07 01:06:34 -08:00
Henrik Holmboe
6830f78228 Add explanatory in-line comment regarding single vs double quotes for sshpass 
It was fixed in 8624b6dcb3. And since the
Salt coding style is to use single quotes it makes sense to explain in
the code why this needs to be the way it is.
 2013-11-07 10:03:32 +01:00
Scott Walton
6f56c316ee Renamed amazon to aws #6444 2013-11-07 08:58:29 +00:00
Scott Walton
bdcf0af470 Merge remote-tracking branch 'upstream/develop' into develop 2013-11-07 08:37:12 +00:00
Forrest Alvarez
da7fa38d0e Updated nodegroups with a few clarifications, updated halite docs with a new section on installing via RPM, when the .deb is done another section needs to be added. 2013-11-07 04:50:13 +00:00
Mike Place
302a763ef9 Add dir_mode for file.managed 
Refs #7860
 2013-11-06 21:13:06 -07:00
Thomas S Hatch
d0d684330f Fix pylint errors 2013-11-06 17:08:22 -07:00
Thomas S Hatch
e64f7b0633 Merge pull request #8311 from s0undt3ch/issues/8196-environments 
Some more `saltenv` related changes/fixes
 2013-11-06 16:07:25 -08:00
Pedro Algarvio
0f9ded1a7a Fix the pip unit tests with regards to the latest saltenv changes. 2013-11-06 23:53:45 +00:00
Ken Jung
0d0454a904 Adds use_wheel option to virtualenv state 2013-11-06 16:48:21 -07:00
Pedro Algarvio
ec0a4bca8e URL environment selection should also be using saltenv. 2013-11-06 23:36:40 +00:00
Thomas S Hatch
eb36882fc1 minor pylint fixes 2013-11-06 16:36:24 -07:00
Pedro Algarvio
c34640b0f6 The Salt environment deprecations will last until Salt Boron. 2013-11-06 23:16:27 +00:00
Thomas S Hatch
6738451c9e Merge pull request #8309 from shadowfax-chc/emerge-errors 
More error reporting in ebuild module
 2013-11-06 15:13:42 -08:00
Thomas S Hatch
bb3ca6512f Merge pull request #8308 from MTecknology/develop 
Added McAfee OS to rh_service
 2013-11-06 15:13:02 -08:00
Thomas S Hatch
85878574a5 Merge pull request #8307 from rsommer/patch-1 
Use single quotes in cmd string to prevent shell expansion of passwords
 2013-11-06 15:12:10 -08:00
Thomas S Hatch
0807fed3e2 Merge pull request #8304 from cachedout/#7944 
Fix exception when compound matching grains
 2013-11-06 15:11:32 -08:00
Thomas S Hatch
c0f6fd68a3 Merge pull request #8303 from basepi/rmcluster 
Remove confusing "computer clusters" reference from docs
 2013-11-06 15:11:17 -08:00
Thomas S Hatch
54a15c575f Merge pull request #8300 from basepi/publishdocs 
Add publish example for limiting targets (docs)
 2013-11-06 15:11:04 -08:00
Pedro Algarvio
f19ad9bd9d Take into account __env__ and saltenv being passed from state files. 2013-11-06 23:10:42 +00:00
Thomas S Hatch
a4b6782999 Merge pull request #8291 from wari/patch-1 
Refactoring: Removed code duplication
 2013-11-06 15:10:23 -08:00
Pedro Algarvio
6e76123a0f saltenv is now a known internal keyword. 2013-11-06 23:06:50 +00:00
Pedro Algarvio
3f280b8622 We will start deprecating until Boron. 2013-11-06 23:05:22 +00:00
Thomas S Hatch
68d5b2c21a Merge pull request #8289 from jacksontj/develop 
Covering case where kwarg cannot be un-yaml'd
 2013-11-06 15:05:14 -08:00
Thomas S Hatch
9af5edee7a Merge pull request #8287 from holmboe/mknod-state-test-true 
Honor test=True with friendlier return message in file.mknod state
 2013-11-06 14:49:53 -08:00
Pedro Algarvio
b82a051aef Correctly trigger the issue reported on #8196. 2013-11-06 22:49:29 +00:00
Pedro Algarvio
3477300d7f Add a test case to check for proper env selection when passing ?env=foo. Refs #8196. 2013-11-06 22:47:55 +00:00
Thomas S Hatch
f7e46978eb Merge pull request #8282 from cachedout/ssh-opts 
salt-ssh opts
 2013-11-06 14:47:46 -08:00
Pedro Algarvio
943d130e8b Several PyLint fixes. 2013-11-06 22:44:08 +00:00
Thomas S Hatch
0f149ed23a Merge pull request #8254 from cachedout/#7691 
Fix bug preventing minions from unloading custom modules.
 2013-11-06 14:40:09 -08:00
Thomas S Hatch
f65d7e46c4 Merge pull request #8251 from heewa/pip_vcs_error_msg 
Avoid hiding error context in VCS pip install.
 2013-11-06 14:37:35 -08:00
Pedro Algarvio
62b7e8c9d1 Add missing commas. 2013-11-06 22:33:01 +00:00
Thomas S Hatch
a343e69d02 Merge pull request #8230 from s0undt3ch/issues/8196-environments 
Properly pass `__env__` to states.
 2013-11-06 14:23:26 -08:00
Michael Lustfield
34a53f9a36 Update rh_service.py 2013-11-06 16:19:16 -06:00
Pedro Algarvio
8c149be174 It's salt.utils not salt.util. 2013-11-06 22:17:50 +00:00