85135 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
twangboy	967b83940c	Fix rehash function ... Use SendMessageTimeout instead of SendMessage which was causing the system to hang in some scenarios Use ctypes to access the dll directly instead of using pywin32 as this seems to actually work	2018-02-08 17:44:28 -07:00
David Murphy	dd2788419b	Fix use of 'su' for AIX to use '-'	2018-02-08 17:43:30 -07:00
Nicole Thomas	9d14ad9ccf	Merge pull request #45925 from terminalmage/fix-spelling ... Fix spelling error in docstring	2018-02-08 16:52:34 -05:00
Marc Vieira-Cardinal (VA2MVC)	6a0b5f7af3	Removed the chained copy	2018-02-08 16:36:20 -05:00
Marc Vieira-Cardinal (VA2MVC)	ad1150fad4	list.copy() is not compatible with python 2.7 ... I doubt that a .copy() is required there since list() would already create one but since the previous committer added it I am improving by replacing the .copy() with a [:] which makes a copy in python 2.7 and 3+	2018-02-08 16:36:19 -05:00
Erik Johnson	bb83e8b345	Add regression test for issue 45893	2018-02-08 16:31:23 -05:00
Erik Johnson	cdda66d759	Remove duplicated section in docstring and fix example	2018-02-08 16:31:23 -05:00
Erik Johnson	4b6351cda6	Check the effective saltenv for cached archive ... This fixes a regression caused by using a saltenv other than `base`.	2018-02-08 16:31:23 -05:00
Ronald van Zantvoort	c54fcf7a2d	cmd: move separate DRY logging blocks into _run, prevent logging on bg=True, don't use_vt on bg	2018-02-08 21:43:02 +01:00
Erik Johnson	7a143fe454	Fix spelling error in docstring	2018-02-08 13:45:24 -06:00
Gareth J. Greenaway	259e60e5d4	Fixing vault when used with pillar over salt-ssh	2018-02-08 11:34:10 -08:00
Ronald van Zantvoort	ebb1f81a9b	cmd run: when running in bg, force ignore_retcode=True	2018-02-08 20:33:31 +01:00
Adam Friedman	1a75786b5a	Fix linter warnings. ... saltstack/salt#45884	2018-02-09 05:16:59 +11:00
Nicole Thomas	0cbe93cd69	Merge pull request #45920 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2018-02-08 10:43:48 -05:00
rallytime	e4e4744218	Merge branch '2016.11' into '2017.7' ... No conflicts.	2018-02-08 10:42:37 -05:00
Nicole Thomas	643a8a5278	Merge pull request #45814 from gtmanfred/2017.7 ... fix cookies dict size changing in http.query	2018-02-08 10:35:30 -05:00
Nicole Thomas	3a3f87c16d	Merge pull request #45877 from rallytime/new-release-notes ... Add release notes file for 2017.7.4 release	2018-02-08 09:07:42 -05:00
Nicole Thomas	1c3cc00670	Merge pull request #45904 from rallytime/bp-41017 ... Back-port #41017 to 2017.7	2018-02-08 08:57:45 -05:00
Nicole Thomas	317d35bd15	Merge pull request #45907 from terminalmage/fix-grains-backport ... Fix backport of grains fix	2018-02-08 08:57:26 -05:00
Nicole Thomas	dade5f0cab	Merge pull request #45906 from rallytime/bp-45548 ... Back-port #45548 to 2017.7	2018-02-08 08:57:06 -05:00
Nicole Thomas	82c473a1fe	Merge pull request #45902 from terminalmage/issue45893 ... Check the effective saltenv for cached archive	2018-02-08 08:41:59 -05:00
Nicole Thomas	fdedde3cfb	Merge pull request #45862 from rallytime/bp-45830 ... Back-port #45830 to 2017.7	2018-02-08 08:22:25 -05:00
Damon Atkins	b4d0b23891	py3 fix	2018-02-08 23:51:30 +11:00
Damon Atkins	75d9e20d8a	Add ignoring 'terminated', 'stopped' instances, to improve changes of a single match	2018-02-08 23:06:10 +11:00
Adam Friedman	82ec0b589c	Revert to using salt.utils.cloud.is_public_ip. ... saltstack/salt#45884	2018-02-08 10:14:52 +11:00
Adam Friedman	9b6b01873b	Fix violations reported by flake8. ... saltstack/salt#45884	2018-02-08 08:39:43 +11:00
Adam Friedman	a2bc155c73	Use __utils__['cloud.'] instead of salt.cloud.utils. ... saltstack/salt#45884	2018-02-08 08:39:33 +11:00
Adam Friedman	98907a32cb	Ensure 'auth' parameter is correctly passed to dimensiondata driver. ... Also ensure that it is nevertheless excluded from the event payload. saltstack/salt#45884	2018-02-08 08:39:24 +11:00
Adam Friedman	de26b03e2c	Fix copy/paste bug in dimensiondata provider integration test. ... saltstack/salt#45884	2018-02-08 08:39:07 +11:00
Adam Friedman	6b1b6be427	Add integration tests for dimensiondata cloud provider. ... saltstack/salt#45884	2018-02-08 08:38:58 +11:00
Adam Friedman	f6ea9fed7d	Ensure that event data provided by the dimensiondata driver is serialisable. ... saltstack/salt#45884	2018-02-08 08:38:43 +11:00
Erik Johnson	9d200efc26	Add regression test for issue 45893	2018-02-07 14:32:59 -06:00
Erik Johnson	6cf7e50cc4	Fix backport of grains fix ... A fix recently made to the salt/grains/disks.py was backported to 2017.7, but the fopen function was moved in oxygen and so the function does not exist in 2017.7. This did not make it into 2017.7.3 so there is no need to add this fix to any hotfixes.	2018-02-07 13:59:01 -06:00
Viktor Daniel	1befa7386c	Update x509.py ... Fixed typo in docu string	2018-02-07 14:54:02 -05:00
Carsten Brandt	80c56cdcea	Fixed typo in pkg state documentation ... A `:` is missing for the yaml to be valid. This was introduced by f4abf7f03a, which added sub items but missed changing this line too.	2018-02-07 14:17:10 -05:00
Erik Johnson	1468f1d0ff	Remove duplicated section in docstring and fix example	2018-02-07 13:12:30 -06:00
Erik Johnson	6cc5cd9b8a	Check the effective saltenv for cached archive ... This fixes a regression caused by using a saltenv other than `base`.	2018-02-07 12:49:52 -06:00
Damon Atkins	0093472a37	added tag_key_list and tag_key_sep to create ec2_tags_list	2018-02-08 01:24:42 +11:00
Damon Atkins	afb3968aa7	ec2_pillar could not find instance-id, resolved. ... add support to use any tag to compare minion id against.	2018-02-07 02:03:15 +11:00
rallytime	f937e8ba81	Add release notes file for 2017.7.4 release	2018-02-06 09:57:22 -05:00
Nicole Thomas	27ff82f996	Merge pull request #45864 from rallytime/release-note-fix ... Remove extraneous ] in release notes for 2016.11.9	2018-02-06 09:31:09 -05:00
rallytime	104a24f244	Remove extraneous ] in release notes for 2016.11.9	2018-02-05 16:34:19 -05:00
Nicole Thomas	43a45b42c3	Merge pull request #45779 from The-Loeki/patch-3 ... SSH shell shim: Don't use $() for optimal support	2018-02-05 13:35:20 -05:00
Gareth J. Greenaway	1024856f9a	Wrapping the put_nowait in a try...except and catching the exception when the multiprocessing queue is full. This situation is happening when running the full testing suite on MacOS where the queue limit is 32767 vs on Linux where the queue limit is unlimited.	2018-02-05 13:16:35 -05:00
Nicole Thomas	cca997d0da	Merge pull request #45788 from rallytime/2017.7.3_docs ... [2017.7] Bump latest and previous versions	2018-02-05 10:30:46 -05:00
Nicole Thomas	5fa010de2b	Merge pull request #45787 from rallytime/2016.11.9_docs ... [2016.11] Bump latest and previous versions	2018-02-05 10:30:20 -05:00
Nicole Thomas	746206cebe	Merge pull request #45842 from rallytime/bp-45827 ... Back-port #45827 to 2017.7	2018-02-05 10:04:10 -05:00
Nicole Thomas	900aadcd67	Merge pull request #45721 from garethgreenaway/44978_show_duration_when_no_state_run ... [2017.7] Ensure duration and start time exist	2018-02-05 09:59:32 -05:00
Nicole Thomas	80a2d009b4	Merge pull request #45517 from kstreee/fix-mkdir ... Fixes base dir making logic to ensure not raising the exception when base directory already exists.	2018-02-05 09:56:22 -05:00
Ronald van Zantvoort	8575ae3d52	Merge branch '2017.7' into patch-3	2018-02-04 21:16:52 +01:00