89765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	6f8f477fa3	Merge pull request #45400 from terminalmage/fix-coregrains ... Fix traceback in core grains on Ubuntu 14	2018-01-12 09:54:05 -05:00
Nicole Thomas	7fa3df48ac	Merge pull request #45404 from twangboy/win_fix_test_vagrant ... Fix `unit.modules.test_vagrant` for Windows	2018-01-12 09:53:12 -05:00
Nicole Thomas	932ca0b33a	Merge pull request #45403 from terminalmage/windows-encode-decode-fallbacks ... Fall back to utf-8 when to_str/to_unicode/to_bytes fail to encode/decode	2018-01-12 09:49:35 -05:00
Nicole Thomas	b3b8e26b34	Merge pull request #45410 from s0undt3ch/oxygen ... Stop using the depracated `salt.utils.get_user()` function.	2018-01-12 09:48:03 -05:00
Pedro Algarvio	5cee46ec41	Stop using the depracated salt.utils.get_user() function.	2018-01-12 10:33:31 +00:00
Daniel Wallace	c378c356eb	fix moto version ... Fixes saltstack/salt-jenkins#692	2018-01-11 17:42:59 -07:00
twangboy	df64c60530	Remove hard-coded, linux-style paths	2018-01-11 23:24:46 +00:00
Erik Johnson	6fbe368b71	Fall back to utf-8 on windows when to_str/to_unicode/to_bytes fail to encode/decode	2018-01-11 16:49:03 -06:00
Daniel Wallace	fdcf71a10c	fix test boto imports ... Test boto imports are failing for some reason	2018-01-11 15:14:25 -07:00
Erik Johnson	8cb442af5f	Fix traceback in core grains on Ubuntu 14 ... It turns out that six.b() is a damn dirty liar on Python 2 and doesn't always produce a str() type.	2018-01-11 15:43:40 -06:00
Nicole Thomas	0e6cf84f65	Merge pull request #45392 from gtmanfred/oxygen ... Disable discovery in test suite	2018-01-11 16:14:19 -05:00
rallytime	60370f5fb6	Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/config/__init__.py - salt/daemons/masterapi.py - salt/proxy/dummy.py - salt/states/file.py - tests/integration/modules/test_state.py - tests/integration/runners/test_runner_returns.py - tests/integration/ssh/test_state.py - tests/support/parser/__init__.py - tests/unit/grains/test_core.py - tests/unit/states/test_file.py	2018-01-11 16:00:08 -05:00
Nicole Thomas	2340f0b487	Merge pull request #45380 from twangboy/backport_45308 ... Backport changes from #45308	2018-01-11 14:45:20 -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
Daniel Wallace	065ae4e61f	increase timeout for starting daemons	2018-01-11 10:45:47 -07:00
Daniel Wallace	3cb91b4d63	disable discovery in test suite	2018-01-11 09:58:14 -07: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
Nicole Thomas	223470519d	Merge pull request #44830 from terminalmage/issue40776 ... Implement variable fileserver update intervals	2018-01-11 09:10:36 -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	c205c10e89	Added Slots release note.	2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko	3bc17b4fb4	Avoid unicode args issue.	2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko	fe87704ff2	Slots: @terminalmage code review fixes.	2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko	535024f03a	Slots: minor fixes.	2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko	b55bba0d46	Slots documentation.	2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko	f40cb3f2f1	Slots: bugfixes and tests.	2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko	9782b4e9a8	Working slots concept for execution modules.	2018-01-11 14:05:57 +03:00
Thomas S Hatch	deaa1dccc9	start work on slots... again	2018-01-11 14:05:57 +03: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	a37f7d7cd4	Merge pull request #45377 from terminalmage/py3-log-grains ... [PY3] add unicode_literals to log/grains modules	2018-01-10 15:14:23 -05: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
twangboy	419be8a9b5	Backport changes from #45308	2018-01-10 11:16:59 -07:00
Daniel Wallace	3633ceeaa7	Merge branch '2017.7' into 2017.7	2018-01-10 11:11:29 -07:00
Erik Johnson	f900715e1c	[PY3] add unicode_literals to log/grains modules	2018-01-10 11:37:59 -06: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
Nicole Thomas	54dc7b76e5	Merge pull request #45340 from twangboy/win_fix_test_beacons ... Fix `unit.modules.test_beacons` for Windows	2018-01-10 12:10:52 -05:00
Erik Johnson	ccfa24260d	Fix warnings when default config values are set to None	2018-01-10 09:42:20 -06: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