60424 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
twangboy	2815efc522	Fixes spelling	2016-02-01 18:36:23 -07:00
twangboy	6027e1ec53	Updates documentation to reflect new features	2016-02-01 18:32:56 -07:00
twangboy	1444ab1a48	Adds return success/failure for reg.broadcast_change	2016-02-01 17:17:18 -07:00
twangboy	f2a36904d2	Fixes problem with missing key in old	2016-02-01 16:42:51 -07:00
twangboy	581a4df523	Added logic for dealing with latest in remove	2016-02-01 16:38:19 -07:00
twangboy	c4357a6d80	Adds more logic for detecting latest	2016-02-01 16:25:56 -07:00
twangboy	40a66a2501	Logic for handling version: latest	2016-02-01 16:15:46 -07:00
twangboy	b7dadd3b9b	Fixes message formatting	2016-02-01 15:40:08 -07:00
twangboy	a305c8ceae	Added more descriptive failure message	2016-02-01 15:31:02 -07:00
twangboy	fe49dcb57c	Added broadcast change to force registry update	2016-02-01 14:58:06 -07:00
Mike Place	7b44c0844d	Merge pull request #30794 from rallytime/boto_ec2-mod-doc-fix ... A spelling fix and some spacing fixes for the boto_ec2 module docs	2016-02-01 14:45:33 -07:00
Mike Place	1f87ad0387	Merge pull request #30756 from basepi/highstate.outputter.23789 ... [2015.8] Fix two error conditions in the highstate outputter	2016-02-01 14:39:23 -07:00
rallytime	5188bc4b96	A spelling fix and some spacing fixes for the boto_ec2 module docs	2016-02-01 14:30:14 -07:00
Mike Place	46adb2d1af	Merge pull request #30788 from rallytime/fix-dellchassis-doc-example ... Fix incorrect doc example for dellchassis blade_idrac state	2016-02-01 14:20:29 -07:00
Mike Place	333041aeb1	Merge pull request #30791 from Ch3LL/2015.8 ... do not shadow ret function argument for salt.function	2016-02-01 13:07:31 -07:00
rallytime	bfc16d9f7a	Fix incorrect doc example for dellchassis blade_idrac state	2016-02-01 11:31:13 -07:00
Colton Myers	16ad24d42c	Import the logger	2016-02-01 11:28:38 -07:00
Mike Place	ce3be26e8f	Merge pull request #30726 from sjmh/fix/log4mongo ... Fix improper use of yield in generator	2016-02-01 11:13:24 -07:00
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
root	d54f220c0a	do not shadow ret function argument for salt.function	2016-01-29 23:24:51 +00:00
Colton Myers	1b5c6a240c	Handle non-string types in comment ... This is not supported, but we should convert blindly to string rather that stacktracing the highstate outputter.	2016-01-29 16:16:01 -07:00
Colton Myers	11e34d047b	Ensure rdurations are all floats for the highstate outputter	2016-01-29 16:15:55 -07: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
Justin Findlay	f8f867570f	modules.lxc.running_systemd: use command -v not which ... Fixes #30676. http://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html	2016-01-29 12:26:34 -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
Steve Hajducko	d501f1cc03	Fix improper use of yield in generator ... The log4mongo setup_handler was using yield incorrectly. Yield simply pauses execution at the point of the yield, and then the next call continues from the point of the yield. By yielding false at the beginning of the generator and not checking the __opts__ for the name ( again ), it was simply continuing the execution, even if log4mongo was not configured.	2016-01-28 16:54:53 -08: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
Adam Tengler	12dc677628	Changed list conversion to use correct method and return whole set	2016-01-28 11:20:19 +01: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