92615 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel A. Wozniak	f89668920a	Be explicit about winrm setting	2018-05-21 14:29:17 -07:00
Nicole Thomas	f45a96ba1d	Merge pull request #47668 from Ch3LL/win_pkg_test ... Add pkg.latest_version windows test	2018-05-21 16:26:44 -04:00
Nicole Thomas	7b12444dfa	Merge pull request #47750 from dwoz/cloudtest ... Allow ssh_interface to default to public_ips	2018-05-21 13:14:10 -04:00
Daniel A. Wozniak	63b722ba21	Allow ssh_interface to default to public_ips	2018-05-21 09:30:45 -07:00
Nicole Thomas	bbe8e62a98	Merge pull request #47724 from terminalmage/master_tops_fixes ... 2 master_tops/ext_nodes fixes	2018-05-21 11:59:03 -04:00
Nicole Thomas	97d6fe7434	Merge pull request #47739 from rallytime/bp-47702 ... Back-port #47702 to 2018.3.1	2018-05-21 11:37:02 -04:00
Nicole Thomas	cfbe0ba73e	Merge pull request #47730 from rallytime/bp-47700 ... Back-port #47700 to 2018.3.1	2018-05-21 11:36:15 -04:00
Gareth J. Greenaway	48b8c5acd1	Merge branch '2018.3.1' into master_tops_fixes	2018-05-21 08:32:54 -07:00
Erik Johnson	cd484bef69	Fix "dnf list upgrades" parsing ... The header for the output of this command appears to have changed at some point, which breaks our output parsing. This adds the new header to the `_strip_headers()` helper so that we ignore it while parsing.	2018-05-21 09:49:08 -05:00
rallytime	e458f4a031	Merge branch '2017.7.6' into '2017.7' ... No conflicts.	2018-05-21 10:34:10 -04:00
Nicole Thomas	0d5b473ce2	Merge pull request #47747 from Ch3LL/rn_2017.7.6 ... Add changelog to 2017.7.6 release notes	2018-05-21 10:24:59 -04:00
Nicole Thomas	27fbb42210	Merge pull request #47737 from dwoz/win_timeout ... Cloud test fixup	2018-05-21 10:19:48 -04:00
Ch3LL	d4aa83b92d	Add changelog to 2017.7.6 release notes	2018-05-21 10:01:00 -04:00
rallytime	f79da64bb0	Update is_windows path to use platform	2018-05-21 09:59:08 -04:00
Nicole Thomas	19f4137b63	Merge pull request #47740 from garethgreenaway/46938_beacons_documentation ... [2018.3] Updating Beacon topic to include list based configuration for Beacons	2018-05-21 09:58:00 -04:00
Nicole Thomas	3614d3d83a	Merge pull request #47727 from Ch3LL/spelling ... Fix salt.utils.versions.warn_until spelling	2018-05-21 09:40:59 -04:00
Nicole Thomas	bb45cdaefe	Merge pull request #47736 from Ch3LL/fix_util_mac_test ... mac_utils test: patch __salt__['cmd.run*']	2018-05-21 09:38:58 -04:00
Daniel A. Wozniak	e88833a07d	Cloud test fixup ... - Increase winrm timeout - Ignore winrm tests when dependencies are missing	2018-05-20 01:24:03 -07: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
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
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
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
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	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