94449 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
nicholasmhughes	c6c0c9f7b6	fixes #47096 serialization error on event firing for bootstrap	2018-05-19 22:53:03 -04:00
Gareth J. Greenaway	5d23ef4dd8	Updating Beacon topic to include list based configuration for Beacons	2018-05-19 16:29:27 -07:00
Nicole Thomas	1a93f060fb	Merge pull request #47729 from UtahDave/fix_get_info_doc ... fix cli example to match function name	2018-05-19 07:31:20 -04:00
Damon Atkins	f04b19b5b6	Ensure targeted_pkgs always contains value for non-windows.	2018-05-19 07:23:26 -04:00
Damon Atkins	14659f9cad	Adjusted based on feed back.	2018-05-19 07:23:20 -04:00
Damon Atkins	9f18f7cdf5	Whitespace lint issues	2018-05-19 07:23:12 -04:00
Damon Atkins	2a29b28ee6	pkg.install execution module on windows ensures the software package is ... installed when no version is specified, it does not upgrade the software to the latest. This is per the design. pkg.latest must provide the versions to install to pkg.install	2018-05-19 07:23:05 -04:00
Nicole Thomas	8a5b34f7d9	Merge pull request #47702 from damon-atkins/2017.7.6_fix_pkg.latest_state ... State pkg.latest called win pkg.install with list of pkgs and the required versions	2018-05-19 07:21:22 -04:00
Damon Atkins	adcc094e08	Merge branch '2017.7.6' into 2017.7.6_fix_pkg.latest_state	2018-05-19 12:40:51 +10:00
twangboy	e27e9fd1e7	Fix tests on Py3	2018-05-18 16:17:41 -06:00
Ch3LL	ee90c779a8	mac_utils test: patch __salt__['cmd.run*']	2018-05-18 16:48:48 -04:00
Damon Atkins	d51662e053	Ensure targeted_pkgs always contains value for non-windows.	2018-05-19 05:23:19 +10:00
slaws	2fb78e804c	Fix lint errors	2018-05-18 21:14:06 +02:00
Nicole Thomas	d610c192d9	Merge pull request #47700 from yannj-fr/2017.7.6 ... fix roots modification time check	2018-05-18 14:42:16 -04:00
Yann Jouanin	9bc35b88ea	fix roots modification time check	2018-05-18 14:40:17 -04:00
coutotyler	fc5ff2210a	Adding the versionadded tag and argument definitions	2018-05-18 09:57:25 -07:00
coutotyler	f7de31234d	Fixing example code block. Fixing pylint space error.	2018-05-18 09:57:25 -07:00
coutotyler	5fc12d6d9c	Adding a merge_all function to slsutil ... The merge_all function merges a list of objects in order. This will make it easier to merge more than two objects.	2018-05-18 09:57:25 -07:00
Nicole Thomas	22807ac756	Merge pull request #47710 from terminalmage/fix-loader-whitelist ... salt.loader: add error logging when whitelist lookup fails	2018-05-18 12:56:18 -04:00
David Boucha	443a2d72a2	fix cli example to match function name	2018-05-18 10:51:46 -06:00
Nicole Thomas	00a13761c7	Merge pull request #47682 from terminalmage/issue47182 ... Fix traceback when excludes are present in an included SLS file	2018-05-18 12:47:46 -04:00
Ch3LL	47a8de5b73	Fix salt.utils.versions.warn_until spelling	2018-05-18 11:59:45 -04:00
Yann Jouanin	961c1ef61e	fix roots modification time check	2018-05-18 17:59:26 +02:00
Yann Jouanin	aef37dd1ce	fix roots modification time check	2018-05-18 17:58:01 +02:00
Yann Jouanin	2a73e905df	Merge branch '2017.7.6' into 2017.7.6	2018-05-18 17:54:05 +02:00
Mike Place	daf3c7975d	Merge branch 'develop' into deprecate-sdecode	2018-05-18 10:36:10 -05:00
Mike Place	ebd8fc28d6	Merge pull request #47658 from bbczeuz/bbczeuz-patch-file-doc ... File Module: manage_file: Broken CLI example	2018-05-18 10:33:30 -05:00
Mike Place	0bc046fbe8	Merge pull request #47678 from meaksh/develop-add-all-versions-to-pkg-info-installed ... [develop] Collect all versions of installed packages on SUSE and RHEL systems	2018-05-18 10:26:54 -05:00
Nicole Thomas	518f7bcc62	Merge pull request #47708 from darkpixel/47696-do-not-enumerate-none ... Wrap properties loop with a check for None. Closes GH-47696	2018-05-18 11:25:43 -04:00
Mike Place	b17f6f3625	Merge pull request #47688 from moench-tegeder/postgresql_remove_createuser ... postgres: remove all references to "CREATEUSER" role flag	2018-05-18 10:21:55 -05:00
Mike Place	f5e3f3e9e0	Merge pull request #47698 from isbm/isbm-prevent-crash-master-nonroot ... Bugfix: crash when master runs as non-root	2018-05-18 10:09:31 -05:00
Erik Johnson	89b3070d4c	Change deprecation warning to debug logging ... This prevents a confusing warning from being logged to the console (and to the log file upon each salt-minion daemon restart). It seems that the intent of the deprecation warning was to use the logic in `warn_until` to force us to make the final deprecation when the Magnesium release cycle arrives, but when we do these sort of deprecations we are typically pro-active and do a grep on the release codename. So, keeping "Magnesium" in the log message should be sufficient to remind us of this.	2018-05-18 10:08:27 -05:00
Erik Johnson	ceb6e10f87	Fix spurious "Malformed request" error ... Since we are invoking _ext_nodes now for backward compatibility, an entry for it needed to be added to the cmd_stub.	2018-05-18 10:08:27 -05:00
Nicole Thomas	43930f8bac	Merge pull request #47641 from gtmanfred/2018.3.1 ... fix _create_stream and tornado 5.0	2018-05-18 10:25:35 -04:00
Nicole Thomas	266749420f	Merge pull request #47632 from gtmanfred/2017.7.6 ... handle new _create_stream in tornado 5.0	2018-05-18 10:25:16 -04:00
Erik Johnson	6192391b7b	Add additional missing modules to whitelist	2018-05-18 08:50:53 -05:00
Erik Johnson	7192c38f66	Change key -> function to make log message more clear ... Leaving it as "key" would potentially confuse people into thinking there was a problem with an SSH/SSL/TLS/etc. key.	2018-05-18 08:46:21 -05:00
Nicole Thomas	8944d33b4b	Merge pull request #47703 from babs/fix-elasticsearch-index_template_present ... Fix elasticsearch.index_template_present with check_definition	2018-05-18 09:36:03 -04:00
Nicole Thomas	9f926bcd1a	Merge pull request #47541 from gtmanfred/2018.3 ... switch skip-roster to update-roster	2018-05-18 09:29:49 -04:00
Nicole Thomas	2643c356af	Merge pull request #47720 from rallytime/bp-47692-2017.7.6 ... Back-port #47692 to 2017.7.6	2018-05-18 09:23:02 -04:00
Nicole Thomas	a963f1b558	Merge pull request #47719 from rallytime/bp-47692 ... Back-port #47692 to 2018.3.1	2018-05-18 09:22:01 -04:00
Daniel A. Wozniak	6e5cb36839	Default windows to m1.small for ec2-classic	2018-05-18 09:21:33 -04:00
Daniel A. Wozniak	1d9f247fb7	Default windows to m1.small for ec2-classic	2018-05-18 09:20:08 -04:00
Daniel Wallace	50b49d63c6	Merge pull request #47492 from plastikos/improvement-spm-base_paths ... Various clean-ups, fixes and improvements to SPM directory references	2018-05-18 07:41:43 -05:00
plastikos	2ddd589f68	Merge branch 'develop' into improvement-spm-base_paths	2018-05-17 23:09:05 -06:00
Aaron C. de Bruyn	54e9bf9ec9	Merge branch '2017.7' into 47696-do-not-enumerate-none	2018-05-17 21:34:53 -07:00
Daniel Wallace	c9108893ab	Merge pull request #47706 from Ch3LL/mac_service_util ... Add cmd._run_all_quiet to mac_utils and __utils__ in mac_service	2018-05-17 20:11:45 -05:00
slaws	80df75fce2	Fix inline documentation	2018-05-18 01:08:48 +02:00
slaws	72c14cb2b5	Add write_raw method to vault module ... This method allow to write complex data to the vault	2018-05-18 00:49:31 +02:00
Erik Johnson	91f9fd38fd	Fix loader whitelists in unit tests ... This resolves failed lazydict lookups in the tests due to improperly-set whitelists.	2018-05-17 16:43:36 -05:00