84714 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	c3fdd1dcc4	Merge pull request #45395 from rallytime/bp-45380 ... Back-port #45380 to 2017.7.3	2018-01-12 13:49:20 -05:00
twangboy	0356b3d56f	Backport changes from #45308	2018-01-11 15:36:38 -05:00
Nicole Thomas	f7da716d32	Merge pull request #45294 from gtmanfred/2017.7 ... include backports_abc	2018-01-11 13:18:15 -05:00
Nicole Thomas	f77a3e9cd4	Merge pull request #45381 from gtmanfred/module.run ... fix module.run docs	2018-01-11 13:02:37 -05:00
Nicole Thomas	8efd29f4d9	Merge pull request #45368 from DSRCorporation/bugs/zmq_draft ... Fixes to work with pyzmq with --enable-drafts	2018-01-11 12:53:15 -05:00
Nicole Thomas	22c3efda06	Merge pull request #45371 from rallytime/bp-45158 ... Back-port #45158 to 2017.7	2018-01-11 12:51:37 -05:00
Nicole Thomas	3a0e2de995	Merge pull request #45387 from renner/patch-2 ... Set SHELL environment variable	2018-01-11 11:23:21 -05:00
Nicole Thomas	dcf98a2260	Merge pull request #45388 from terminalmage/fix-test-loader-error ... Fix loader error in 2017.7 tests	2018-01-11 11:13:52 -05:00
Daniel Wallace	230e899192	fix module.run docs	2018-01-11 09:12:19 -07:00
Erik Johnson	5473c085d9	Fix loader error in 2017.7 tests	2018-01-11 08:40:27 -06:00
Nicole Thomas	d15f9e1020	Merge pull request #45382 from terminalmage/salt-jenkins-686 ... Skip flaky test on 2017.7 branch	2018-01-11 09:23:04 -05:00
Johannes Renner	530ddd2d29	Set SHELL environment variable ... When passing a ProxyCommand option to salt-ssh a valid $SHELL is needed to execute the given command.	2018-01-11 13:37:38 +01:00
Dmitry Kuzmenko	7622e355cf	Minor: removed a stale comment.	2018-01-11 14:03:41 +03:00
Dmitry Kuzmenko	00f31bf9b5	Fixes to work with pyzmq with --enable-drafts ... 1. Let pyzmq to correctly cleanup stream by itself 2. Don't close IOLoop that closes managed IO objects until full async object cleanup that produces closing streams and attempts to operate to strutures deinitialized by the closed IOLoop.	2018-01-11 14:03:38 +03:00
Nicole Thomas	dbe21b2c0d	Merge pull request #45369 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2018-01-10 17:14:04 -05:00
Erik Johnson	ff3039db6c	Skip flaky test on 2017.7 branch ... The behavior of the set union used to combine ext_nodes and top file matches is not consistent on Python 3 (well, 3.5 at least), and this produces flaky test results. Since we do not change things like the state compiler in point releases, the method used to combine the ext_nodes and top file matches has been changed for Oxygen and is now fully deterministic. This test will therefore be skipped for the remainder of the 2017.7 release cycle on Python 3. Fixes https://github.com/saltstack/salt-jenkins/issues/686.	2018-01-10 16:02:32 -06:00
Nicole Thomas	55979b3a48	Merge pull request #45379 from rhoths/rhoths-doc-highstate-1 ... Minor spelling/grammar fixes in the highstate returner documentation	2018-01-10 15:09:51 -05:00
Chase Urich	afbbd492cd	Minor spelling/grammar fixes in highstate returner	2018-01-10 12:18:55 -06:00
Daniel Wallace	3633ceeaa7	Merge branch '2017.7' into 2017.7	2018-01-10 11:11:29 -07:00
Nicole Thomas	541e59fa75	Merge pull request #45358 from UtahDave/gate_data_cache_refresh ... gate the minion data cache refresh events.	2018-01-10 12:21:04 -05:00
Erik Johnson	3565bc2bf2	Don't use include-test SLS in orch tests ... This was the _actual_ cause of the failing test in the state module integration tests.	2018-01-10 10:29:15 -05:00
Erik Johnson	8bc17e0d7a	Fix integration.modules.test_state.StateModuleTest.test_exclude ... test_exclude shares file paths with test_include, and while I can't reproduce the failures, it is likely that improperly cleaned-up files from test_include are causing the failures in test_exclude. This is backed up by the fact that the state.sls return data from the salt-runtests.log shows no trace of the "to-include-test" file (suggesting it was excluded as expected), yet os.path.isfile() returns True for this path, causing the test to fail. This commit uses a distinct base dir for both tests, which should keep this sort of failure from happening.	2018-01-10 10:29:15 -05:00
rallytime	f65e091df8	Merge branch '2016.11' into '2017.7' ... No conflicts.	2018-01-10 10:15:19 -05:00
Daniel Wallace	29806e4496	ignore salt.ext in pylint	2018-01-09 17:49:50 -07:00
David Boucha	379b6cd23e	should be self, not salt	2018-01-09 16:26:56 -07:00
David Boucha	a82e158f2d	gate the minion data cache refresh events.	2018-01-09 15:52:16 -07:00
Nicole Thomas	fb87010461	Merge pull request #45297 from Ch3LL/mac_service_state ... Allow macosx service state tests to check for pid return	2018-01-09 15:47:23 -05:00
Gareth J. Greenaway	beedf6e815	Merge pull request #45351 from dmurphy18/upd_debbuild ... Update debbuild to explicitly include source code for Debian, Ubuntu	2018-01-09 09:21:50 -08:00
David Murphy	478dc70092	Update debbuild flags	2018-01-09 10:10:51 -07:00
Nicole Thomas	66da9b47bc	Merge pull request #45299 from garethgreenaway/config_gate_auth_events ... [2017.7] config gate auth_events	2018-01-09 10:00:30 -05:00
Daniel Wallace	8b597a4890	include backports_abc ... Older version of python need this file to work with tornado when using salt-ssh. Since you can run a newer version of python3 that has the file as collections.abc, it won't be installed, but it still needs to be included in the thin tarball if the salt-ssh minion is < 3.5 Fixes #44107	2018-01-08 15:36:16 -07:00
Gareth J. Greenaway	9a15ec3430	Updating versionadded string. Fixing typo.	2018-01-08 13:53:56 -08:00
Nicole Thomas	8d04c2b3d4	Merge pull request #44856 from Ch3LL/running_test ... Add state.running ssh integration test	2018-01-08 16:40:49 -05:00
Nicole Thomas	0959ae4ea3	Merge pull request #45327 from lomeroe/bp-44861_2016.11 ... Backport #44861 to 2016.11	2018-01-08 16:10:41 -05:00
Nicole Thomas	d0e5e70277	Merge pull request #45295 from gtmanfred/test_directory ... test directory that doesn't exist	2018-01-08 15:59:52 -05:00
twangboy	784139f734	Check for values other than 0 or 1	2018-01-08 12:17:04 -06:00
Nicole Thomas	f49b204b75	Merge pull request #45302 from gtmanfred/proxyp3 ... fix proxy tests for py3 on 2017.7	2018-01-08 12:41:57 -05:00
Nicole Thomas	a6db5f95f0	Merge pull request #45268 from damon-atkins/2016.11_win_pkg_pkg_install_latest ... Fix pkg.install packagename version=latest i.e. if on an old version is installed	2018-01-08 12:34:14 -05:00
Nicole Thomas	eea7158e82	Merge pull request #45279 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2018-01-08 12:26:48 -05:00
Nicole Thomas	e6178fe6d4	Merge branch '2017.7' into test_directory	2018-01-05 17:08:58 -05:00
Ch3LL	9a35a73711	add time limit to while loop	2018-01-05 16:18:31 -05:00
Daniel Wallace	b295ec0429	make dummy proxy module py3 compatible	2018-01-05 13:36:09 -07:00
Daniel Wallace	8736e21f65	fix starting proxy minion on py3	2018-01-05 13:36:09 -07:00
Daniel Wallace	e2824a7253	fix py3 tests	2018-01-05 13:36:08 -07:00
Gareth J. Greenaway	edfc3dc078	Adding in documention for auth_events configuration option	2018-01-05 12:29:21 -08:00
Daniel Wallace	24114e91c1	test was different slightly on 2017.7	2018-01-05 12:25:09 -07:00
Gareth J. Greenaway	3ee4eabffd	Fixing small typo	2018-01-05 10:06:50 -08:00
Gareth J. Greenaway	6a28bddcc9	Adding some code to config gate if auth_events are sent	2018-01-05 10:06:50 -08:00
Nicole Thomas	dab4a8cff3	Merge pull request #44853 from gtmanfred/vault ... remove not from vault utils	2018-01-05 12:43:17 -05:00
Ch3LL	4e569b5802	Allow macosx service state tests to check for pid return	2018-01-05 12:25:44 -05:00