92332 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gareth J. Greenaway	48b8c5acd1	Merge branch '2018.3.1' into master_tops_fixes	2018-05-21 08:32:54 -07: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
Ch3LL	ee90c779a8	mac_utils test: patch __salt__['cmd.run*']	2018-05-18 16:48:48 -04:00
Ch3LL	47a8de5b73	Fix salt.utils.versions.warn_until spelling	2018-05-18 11:59:45 -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	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	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	1d9f247fb7	Default windows to m1.small for ec2-classic	2018-05-18 09:20:08 -04: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
Ch3LL	3611af699f	remove added space	2018-05-17 16:15:13 -04:00
Ch3LL	9921caa143	fix pylint	2018-05-17 16:14:27 -04:00
Ch3LL	317e41d3c0	use cmd._run_quiet and cmd._run_all_quiet instead of importing minion_mods in __salt__	2018-05-17 16:12:48 -04:00
Ch3LL	a78652515a	Add __salt__ to mac_utils and __utils__ in mac_service	2018-05-17 13:13:12 -04:00
Daniel Wallace	037fd92f59	fix pylint	2018-05-17 10:58:48 -05:00
Daniel Wallace	75d42d8963	Fix last test for tornado ... Thank you so much @bdarnell for helping me get this last fix. With this, the test suite passes with tornado 5.	2018-05-16 21:23:25 -05:00
Daniel Wallace	a046512287	allow using tornado 5.0	2018-05-16 21:23:25 -05:00
Nicole Thomas	fb3bf1ff3e	Merge pull request #47664 from rallytime/bp-47645 ... Back-port #47645 to 2018.3.1	2018-05-15 14:25:27 -04:00
Ch3LL	0a732d8e66	query the pip path for test test_issue_2087_missing_pip	2018-05-15 13:17:54 -04:00
Nicole Thomas	9039fee104	Merge pull request #47647 from rallytime/bp-47601-and-47643-2018.3.1 ... Back-port #47601 and #47643 to 2018.3.1	2018-05-15 10:07:53 -04:00
Daniel A. Wozniak	7214fe17c8	Fix typo	2018-05-14 15:52:41 -04:00
Daniel A. Wozniak	506dceed17	Remove unwanted file	2018-05-14 15:52:35 -04:00
Daniel A. Wozniak	b6a21dfda3	use ignore-undefined-variable	2018-05-14 15:52:30 -04:00
Daniel A. Wozniak	2429f9fe8a	Ignore pylint WindowsError	2018-05-14 15:52:26 -04:00
Daniel A. Wozniak	2d63682fea	Better doc string	2018-05-14 15:52:22 -04:00
Daniel A. Wozniak	ec2adff699	Skip tests when we can not use runas	2018-05-14 15:52:17 -04:00
Daniel Wallace	05e651f038	fix _create_stream and tornado 5.0 ... This should be the last fix for tornado 5.0	2018-05-14 11:00:20 -04:00
Nicole Thomas	17b5265d95	Merge pull request #47596 from rallytime/bp-47568 ... Back-port #47568 to 2018.3.1	2018-05-10 18:09:09 -04:00
Nicole Thomas	c4c400f3e9	Merge pull request #47595 from rallytime/bp-47569 ... Back-port #47569 to 2018.3.1	2018-05-10 18:08:52 -04:00
Nicole Thomas	ec7de14be0	Merge pull request #47599 from rallytime/bp-47570 ... Back-port #47570 to 2018.3.1	2018-05-10 18:06:43 -04:00
Daniel Wallace	9334c03da9	Update dependency to msgpack	2018-05-10 13:21:35 -04:00
Nicole Thomas	2a10d92669	Merge pull request #47571 from rallytime/man-pages ... [2018.3.1] Update man pages	2018-05-10 12:21:56 -04:00
Ch3LL	0763f96458	update salt.utils.platform path for virt core test	2018-05-09 18:02:17 -04:00
rallytime	ade5e9f664	[2018.3.1] Update man pages	2018-05-09 18:17:22 +00:00
Daniel Wallace	8c5c780292	switch skip-roster to update-roster	2018-05-09 12:51:53 -05:00
Ch3LL	718252c1ef	Update salt.utils.path mock in virtual core test	2018-05-09 13:24:39 -04:00
Erik Johnson	ecf5dc8b9f	Add exception logging on serialize/deserialize exceptions ... Since we are reraising an error using our own exception classes, we lose the traceback. This adds exception logging to provide useful information to troubleshoot errors encountered while serializing/deserializing.	2018-05-09 10:54:18 -05:00
Erik Johnson	9659b19819	salt.serializers.yaml/yamlex: remove invalid multi_constructor ... The first argument to add_multi_constructor must be a YAML tag. This is because when PyYAML looks for a constructor to match the tag (in order to get the function to use for deserialization) it matches the tag using `.startswith()`. Thus, when this is attempted using a constructor with a tag value of `None`, an error is raised. The ordering of the list of multi_constructors in the Loader object appears to differ from platform to platform, which explains why this only caused the unit tests to fail on one or two platforms. If a tag match is found, then PyYAML stops iterating through the list of multi_constructors, so this invalid one has been able to stay in Salt without causing any noticeable trouble until now.	2018-05-09 10:48:02 -05:00
Nicole Thomas	85284caaf9	Merge pull request #47550 from pcn/fix-disable-term-protect-in-2018.3 ... Fixes a bad deletion I did that only surfaced in 2018.3	2018-05-09 09:36:32 -04:00
Nicole Thomas	f9083ff77e	Merge pull request #47554 from douglasjreynolds/lxc_unicode_fix ... Converted unicode str version to a LooseVersion; matching line 2080.	2018-05-09 09:34:13 -04:00
Nicole Thomas	fe4e79f1de	Merge pull request #47518 from Ch3LL/zfs_support ... Fix 47364: ensure we are not caching zfs.is_supported	2018-05-09 09:29:06 -04:00
Doug Reynolds	e6bce581c6	Converted unicode str version to _LooseVersion to match line 2080.	2018-05-08 23:36:35 -04:00
Peter C. Norton	d58a56877c	Fixes a bad deletion I did that only surfaced in 2018.3	2018-05-08 17:51:18 -04:00
Nicole Thomas	332e9f13a6	Merge pull request #47159 from terminalmage/whitelist_blacklist-iter-fix ... Fix for whitelist/blacklist checking for non-list iterables	2018-05-08 16:43:50 -04:00
Nicole Thomas	21809ddc02	Merge pull request #47514 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-05-08 14:36:53 -04:00
Ch3LL	d19fef963e	remove unnecessary patch in zfs.is_supported test	2018-05-08 12:14:37 -04:00
Erik Johnson	ca936de372	Treat empty whitelist/blacklist as no whitelist/blacklist	2018-05-08 10:24:21 -05:00
rallytime	e2616b605f	Update the pip tests to use the parsing syntax generated in PR #47196	2018-05-08 10:42:14 -04:00