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
60,422 Commits 24 Branches 182 Tags 341 MiB
cd72b12161
Commit Graph

60422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
64a73502ed Make sure we just the "instance" kwarg in cloud.action. 
Fixes #29602
 2016-01-27 16:45:07 -07:00
Clark Perkins
a71e181c18 Don't set on a volume when creating from a snapshot 2016-01-27 16:34:49 -06:00
Clark Perkins
8cef43c68d When setting del_root_vol_on_destroy, preserve the existing volumeType on the AMI 2016-01-27 16:32:33 -06:00
Colton Myers
9f0e97693c Merge pull request #30666 from cachedout/grains_cache_fix 
Fix grains cache
 2016-01-27 15:23:11 -07:00
Colton Myers
8b17c77d72 Merge pull request #30623 from twangboy/add_config 
Added service.config function
 2016-01-27 14:08:12 -07:00
Nicole Thomas
6af1927bd3 Merge pull request #30678 from rallytime/bp-30668 
Back-port #30668 to 2015.8
 2016-01-27 13:39:25 -07:00
Nicole Thomas
6c71b29f25 Merge pull request #30677 from clarkperkins/bugfix/ec2-volume-logic 
Fix EC2 volume creation logic
 2016-01-27 11:09:29 -07:00
Adam Tengler
97eb4b8bf7 Pop values from new_tags set before loading into dict value 
This was causing state to fail with - Passed invalid arguments: can't serialize set([' tag']). Everytime when tags were defined.
 2016-01-27 19:00:49 +01:00
Nicole Thomas
36142390d4 Merge pull request #30680 from cro/mf20155-20158-20160127 
Merge forward from 2015.5, primarily for #30671
 2016-01-27 10:56:48 -07:00
Clark Perkins
bfec052e7d Added some extra documentation 2016-01-27 11:45:22 -06:00
C. R. Oldham
f8ae3a20ff Merge remote-tracking branch 'upstream/2015.5' into mf20155-20158-20160127 
Mergeforward from 2015.5.
 2016-01-27 10:20:08 -07:00
Jonathan Ballet
7c7076e6af Fix salt.modules.mount documentation 2016-01-27 10:17:35 -07:00
C. R. Oldham
516919525a Merge pull request #30671 from techhat/lockcloud 
Add file locking to cloud index
 2016-01-27 10:14:55 -07:00
Clark Perkins
ed2eee8e39 Allow volume params to be set even when specifying a snapshot 2016-01-27 11:12:12 -06:00
Nicole Thomas
f6feddecb4 Merge pull request #30663 from isbm/isbm-zypper-latest-versionfail 
Zypper: latest version bugfix and epoch support feature
 2016-01-27 10:10:41 -07:00
Nicole Thomas
9d8ddeb525 Merge pull request #30652 from mew1033/fix-sh-beacon 
Fix sh beacon
 2016-01-27 10:00:29 -07:00
Erik Johnson
8b5933fab4 Properly derive the git_pillar cachedir from the id instead of the URL 
Fixes #28257
 2016-01-27 10:45:31 -06:00
Erik Johnson
62654ade1d Add additional reason for pillar env being found 2016-01-27 10:45:19 -06:00
Justin Findlay
8f6737b6c4 output.key: decode minion ids to unicode 2016-01-27 09:43:48 -07:00
Justin Findlay
7a16f1c941 config: decode id to unicode 2016-01-27 09:43:48 -07:00
Joseph Hall
4719f8d4ea Whitespace 2016-01-27 09:32:15 -07:00
Joseph Hall
8e7eca23e4 Add file locking to cloud index 2016-01-27 09:17:14 -07:00
Bo Maryniuk
4336487765 Add support for epoch in Zypper 2016-01-27 12:37:26 +01:00
Bo Maryniuk
12d515fa0c Fix package status filtering on latest version 2016-01-27 12:37:06 +01:00
Nicole Thomas
1fa1963895 Merge pull request #30657 from jfindlay/backport_quiet 
[2015.8] Backport #30378 and #29650
 2016-01-26 17:34:00 -07:00
Nicole Thomas
3621651bf8 Merge pull request #30656 from rallytime/merge-forward-2015.8 
[2015.8] Merge 2015.5 into 2015.8
 2016-01-26 17:33:30 -07:00
rallytime
76ab6981a5 Merge branch '2015.5' into 2015.8 2016-01-26 16:21:29 -07:00
Derek Schaller
ca4adbf382 Adding ability to disable npm install silent flag 2016-01-26 16:19:03 -07:00
Derek Schaller
afe149eb6d Adding ability to disable npm install silent flag 2016-01-26 16:19:03 -07:00
Derek Schaller
c1101b5f0b Adding ability to disable npm install silent flag 2016-01-26 16:19:03 -07:00
Derek Schaller
d29ad8bbf6 Adding ability to disable npm install silent flag 2016-01-26 16:19:02 -07:00
Derek Schaller
7a21dbf0d9 Adding silent flag to npm.bootstrap 2016-01-26 16:09:42 -07:00
Derek Schaller
354c0bdf26 Adding silent flag to npm.bootstrap 2016-01-26 16:09:42 -07:00
Mike Place
52716694f5 Fix grains cache 
Prior to this, custom grains were not being cached at all.
 2016-01-26 16:37:55 -06:00
Chandler Newby
256d037e0f Fix sh beacon 2016-01-26 15:20:33 -07:00
Nicole Thomas
30e03a8b0c Merge pull request #30644 from tbaker57/another_go_at_30573 
Another go at fixing 30573
 2016-01-26 13:18:41 -07:00
root
267b8827fd Another go at fixing 30573 2016-01-26 13:40:15 -05:00
twangboy
c70e182cdf Fixed indenting... got messed up somehow... 2016-01-26 10:38:11 -07:00
twangboy
246f75f2dd Renamed variables, updated docs, added tag 2016-01-26 10:10:22 -07:00
Colton Myers
7d307e2a04 Merge pull request #30611 from isbm/isbm-zypper-latest 
Bugfix: Zypper `pkg.latest` crash fix
 2016-01-26 09:35:47 -07:00
Colton Myers
5bc11d7539 Merge pull request #30631 from rallytime/fix-7811 
Refactor rabbitmq_cluster states to use test=true functionality correctly
 2016-01-26 09:23:49 -07:00
Bo Maryniuk
a7141be651 Put 'kwargs' on its own line according to the common pattern 2016-01-26 10:03:02 +01:00
twangboy
a4534ee94c Fixed documentation 2016-01-25 18:24:22 -07:00
twangboy
54b50236a6 Fixed another error 2016-01-25 18:23:28 -07:00
twangboy
76a0cf33e5 Fixed syntax error 2016-01-25 18:22:55 -07:00
Colton Myers
ef6c4e8377 Merge pull request #30628 from rallytime/fix-25658 
Refactor rabbitmq_policy states to use test=true functionality correctly
 2016-01-25 17:21:03 -07:00
Colton Myers
80d0e428aa Merge pull request #30624 from cro/remove_bad_symlinks 
Remove bad symlinks from osx pkg dir
 2016-01-25 17:02:25 -07:00
Colton Myers
330ea9a292 Merge pull request #30622 from rallytime/fix-30621 
Add glance state to list of state modules
 2016-01-25 16:55:54 -07:00
Colton Myers
f00d8f398a Merge pull request #30618 from rallytime/bp-30591 
Back-port #30591 to 2015.8
 2016-01-25 16:55:20 -07:00
rallytime
bf9ffded6d Refactor rabbitmq_cluster states to use test=true functionality correctly 
Fixes #7811
 2016-01-25 16:47:54 -07:00