valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
65,247 Commits 24 Branches 182 Tags 341 MiB
543f0ca712
Commit Graph

65247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kris Raney
c1f7a9b21b Catch errors that were ignored in cloud trail state updates. Fix bug discovered as a result - was not passing authentication information to _get_trail_arn, causing it to work with the awscli configuration rather than the salt specific one. 2016-01-28 09:31:17 -06:00
Daniel Hobley
9ecfb56c33 Fixed a bug where new changes are detected when nothing changed in proxy state 2016-01-28 15:06:06 +01:00
abednarik
186872cf49 Add Retry to save_load. 
Same as retry in preg_jid this should help fix a race condition when
jod id id is create and another process removes that.

Fixes #28438.
 2016-01-28 10:48:59 -03:00
Daniel Hobley
3153a17da0 Lint fixes 2016-01-28 14:43:37 +01:00
Daniel Hobley
e40092a103 Added the ability to enable icmp rules on Windows Firewalls 
- Added more checks in the unit tests
- Updated unit tests to check for ICMP rules
 2016-01-28 14:38:50 +01:00
Daniel Hobley
6f266cdd73 Added ability to set proxy settings on OSX and Windows 2016-01-28 13:21:15 +01:00
ankitforcode
9f2a68d99b Updated Documentation and Example for creating volume in launch_config when using boto 2016-01-28 14:49:35 +05:30
Steve Hajducko
3544dd995e Fix lsscsi issues for certain platforms 
The lsscsi command doesn't support the '-s' flag on any RHEL/CentOs system
until RHEL7.

The command now have an option to specify 'get_size' to enable
compatibility with the older platforms.

Also fixes some issues with lsscsi not being installed and exceptions
getting thrown because of that.
 2016-01-27 21:15:26 -08:00
Nicole Thomas
36db0f99ed Merge pull request #30687 from clarkperkins/bugfix/del-root-vol-loses-type 
Setting 'del_root_vol_on_destroy' changes the root volume type to 'standard'
 2016-01-27 17:02:26 -07:00
Colton Myers
642bc65e9f Merge pull request #30683 from s0undt3ch/issues/py26-deepcopy-fix 
Allow deepcopies of NamespacedDictWrapper in python 2.6
 2016-01-27 16:59:04 -07:00
Colton Myers
690b8d26b9 Merge pull request #30673 from terminalmage/issue28257 
Properly derive the git_pillar cachedir from the id instead of the URL
 2016-01-27 16:52:01 -07:00
Colton Myers
9b28b09fde Merge pull request #30634 from MorphBonehunter/develop 
Renaming salt-ssh option and documentation fix
 2016-01-27 16:50:11 -07:00
Jorge Schrauwen
42418b8368 fix nested grains always show update due to __grains__.get() not supporting the ":" seperator 2016-01-27 23:31:09 +00:00
Colton Myers
00983b809b Merge pull request #30660 from invsblduck/revert_issue_21084 
Revert service.mod_watch() bug introduced in Issue 21084
 2016-01-27 15:49:37 -07:00
Colton Myers
0ee078eaf1 Merge pull request #30647 from terminalmage/issue11304 
Allow custom types to sync to the master
 2016-01-27 15:35:01 -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
Daniel Wendler
32b71239e7 Extend deprecation warning until Nitrogen 
Show the wipe_ssh deprecation warning until Nitrogen is released.
 2016-01-27 22:50:14 +01:00
Colton Myers
c15999edd9 Merge pull request #30428 from davisj/pillar_cache 
Add pillar_cache functionality to minion.
 2016-01-27 14:28:08 -07:00
Erik Johnson
36cd3f3c4c Revert saltenv='base' changes 
These were unintentional.
 2016-01-27 15:14:31 -06:00
Colton Myers
127455ac17 Merge pull request #30571 from jizhilong/add/ttl_redis_return 
implement clean_old_jobs for redis returner
 2016-01-27 14:11:18 -07:00
Erik Johnson
1aa7c611c8 Add additional clarification re: saltutil runner to boron release notes 2016-01-27 15:10:06 -06:00
Colton Myers
8b17c77d72 Merge pull request #30623 from twangboy/add_config 
Added service.config function
 2016-01-27 14:08:12 -07:00
Colton Myers
4941b268f2 Merge pull request #30632 from twangboy/mac_system 
Mac system
 2016-01-27 14:06:52 -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
Pedro Algarvio
69c0f46891 Allow deepcopies of NamespacedDictWrapper in python 2.6 2016-01-27 19:23:36 +00: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
Nicole Thomas
5d81fa39f0 Merge pull request #30669 from The-Loeki/patch-1 
BCache module: Updates to documentation & small fix
 2016-01-27 10:57:36 -07: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
Nicole Thomas
c5bd513820 Merge pull request #30670 from The-Loeki/patch-2 
SysFS module documentation updates
 2016-01-27 10:20:19 -07: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
Nicole Thomas
de81a85e73 Merge pull request #30668 from multani/fix/docs 
Fix salt.modules.mount documentation
 2016-01-27 10:18:43 -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
9cece0e9ec Merge pull request #30665 from techhat/fixevent 
Add default for __opts__['local']
 2016-01-27 10:12:08 -07: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
Ronald van Zantvoort
36b1fd9893 BCache: small fix in detection data on candidate cache device 2016-01-27 17:56:03 +01: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
Ronald van Zantvoort
8004920004 SysFS doc lint fixes 2016-01-27 17:38:49 +01:00
Joseph Hall
4719f8d4ea Whitespace 2016-01-27 09:32:15 -07:00
Ronald van Zantvoort
e753769f47 lint fixy 2016-01-27 17:22:55 +01:00
Joseph Hall
8e7eca23e4 Add file locking to cloud index 2016-01-27 09:17:14 -07:00
Ronald van Zantvoort
c660cf8e64 SysFS module documentation updates 2016-01-27 17:08:06 +01:00
Ronald van Zantvoort
1683eac8be BCache module: Updates to documentation 2016-01-27 16:54:48 +01:00
Joseph Hall
b2a15ca8d4 Add default for __opts__['local'] 2016-01-27 08:04:25 -07:00