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

60349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
a49b75e065 Merge pull request #30752 from terminalmage/zh459 
Backport systemd and yum/dnf optimizations from develop into 2015.8
 2016-02-01 11:11:42 -07:00
Erik Johnson
8a836c88f4 Update systemd tests 2016-02-01 10:18:08 -06:00
Erik Johnson
54ddb92474 Backport yum/dnf optimizations from develop into 2015.8 
This walks back repoquery usage to just check_db(), preparing for its
complete removal in develop.
 2016-02-01 10:18:08 -06:00
Thomas S Hatch
ea15628446 Merge pull request #30759 from thusoy/empty-files 
Allow managing empty files
 2016-01-31 12:06:37 -07:00
Thomas S Hatch
120d8344e4 Merge pull request #30758 from thusoy/multi-device-mount 
Support mounting labelled volumes with multiple drives
 2016-01-31 12:04:03 -07:00
Thomas S Hatch
9e8af2f994 Merge pull request #30686 from cachedout/pillar_cache_2015_8 
Master-side pillar caching
 2016-01-31 11:52:47 -07:00
Erik Johnson
1ec13699b6 Backport systemd optimizations from develop into 2015.8 
This also makes additional optimizations, such as using globbing instead
of using 'systemctl list-unit-files'.
 2016-01-30 23:49:34 -06:00
Tarjei Husøy
9a6dc4898f Support mounting labelled volumes with multiple drives 
Previous code always tried to remount multi-drive volumes which are common
under btrfs and similar filesystems, because it assumed only a single drive
matched a label.
 2016-01-30 18:50:48 +01:00
Tarjei Husøy
c6244b46ac Allow managing empty files 
Without this patch, specifying an empty file like this:

empty-file:
    file.managed:
        - name: /tmp/empty
        - contents: ''

Did not actually ensure that the file was empty, since the check for content
sources didn't separate between unset values and the empty string.
 2016-01-29 22:04:05 -08:00
Mike Place
4008e1719a Merge pull request #30675 from jfindlay/decode_id 
handle non-ascii minion IDs
 2016-01-29 17:12:10 -06:00
Mike Place
5ca75fbdc9 Merge pull request #30691 from rallytime/cloud-action-instance 
Make sure we use the "instance" kwarg in cloud.action.
 2016-01-29 17:11:37 -06:00
Mike Place
7c632d61d3 Merge pull request #30713 from rallytime/proxy-module-docs 
Fix-up autodoc proxy modules for consistency
 2016-01-29 17:10:54 -06:00
Mike Place
1f5f41cc07 Merge pull request #30741 from jfindlay/locale_state 
states.locale.__virtual__: return exec mod load err
 2016-01-29 17:00:41 -06:00
Colton Myers
716c2bb7c8 Merge pull request #30751 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-01-29 15:43:41 -07:00
Colton Myers
84eeab7720 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/returners/local_cache.py
 2016-01-29 14:57:31 -07:00
Nicole Thomas
1f0d0f591e Merge pull request #30720 from clinta/fix-pem-managed-changes 
x509.pem_managed does not return changes dict
 2016-01-29 10:07:25 -07:00
Justin Findlay
a3a2a44735 states.locale.__virtual__: return exec mod load err 
Fixes #30654.
 2016-01-29 10:01:27 -07:00
Clint Armstrong
5c28efa9d3 return changes on test as well 2016-01-29 11:38:27 -05:00
Thomas S Hatch
076268089a Merge pull request #30699 from abednarik/save_load_retry_time 
Add Retry to save_load.
 2016-01-29 09:08:30 -07:00
Clint Armstrong
e611f0269c fix typos and no changes returned for pem_managed 2016-01-28 15:58:03 -05:00
rallytime
86c3f2016e Fix-up autodoc proxy modules for consistency 
And to make sure everything is displayed in the module index
 2016-01-28 12:33:07 -07:00
Nicole Thomas
8d79d1b9c7 Merge pull request #30659 from sjmh/fix-scsi 
Fix lsscsi issues for certain platforms
 2016-01-28 08:53:38 -07:00
Mike Place
02d8ff626a Pillar cache for master 
Entry point for pillar cache

Working msgpack implementation along with in-memory

Remove debugging

Perms for pillar cache creation

Documentation and small typo fix

Additional documentation note in master config

A note on pillar caching in the documentation on scaling

Backport of pillar cache to 2015.8 branch

Fixed ext pillar with debug

Lint
 2016-01-28 09:44:29 -06: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
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
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
rallytime
0873a41601 Make note of empty dict return in docstring 2016-01-27 16:49:07 -07:00
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
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