94449 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel A. Wozniak	8e42384342	Fix multiple issues in x509 module and state ... Adding a regression test for #49008 and patching the x509 module and state to make the test pass.	2018-09-07 07:46:10 -07:00
Daniel A. Wozniak	2a521586db	Fix encoding issues in file and x509 states	2018-09-07 07:46:10 -07:00
Daniel A. Wozniak	49a6da7dfd	Fix map file loading on windows ... Prevent exceptions on windows from lines trying to be decoded/encoded to ascii	2018-09-07 07:46:10 -07:00
Daniel Wozniak	06935e9211	Merge pull request #49528 from dwoz/mergetests ... Fix merge wart	2018-09-06 16:12:38 -07:00
Gareth J. Greenaway	3298e70607	Merge pull request #49548 from garethgreenaway/1075_disable_boto_tests_part_deux ... [2018.3] Disabling State boto tests for Python 3.7+	2018-09-06 14:50:09 -07:00
Gareth J. Greenaway	0f5191ef7e	Disable various boto tests when run under python 3.7 because of //github.com/spulec/moto/issues/1706. which was causing the test suite to hang on unit tests. This PR is disabling the tests in the test_boto_vpc state tests.	2018-09-06 12:34:47 -07:00
Nicole Thomas	c3468250f4	Merge pull request #49521 from terminalmage/fix-splay-executor ... Fix _get_hash in splay executor	2018-09-06 10:06:53 -04:00
Nicole Thomas	3f7c89cc14	Merge pull request #49526 from terminalmage/fix-backends-error-logging ... Prevent lookup error when trying to lookup fileserver function from LazyDict	2018-09-06 10:01:29 -04:00
Nicole Thomas	bf939f9811	Merge pull request #49524 from garethgreenaway/1075_disable_boto_tests ... [2018.3] Disable boto tests under 3.7	2018-09-06 09:35:18 -04:00
Daniel A. Wozniak	6a4f8239d7	Fix merge wart	2018-09-05 23:34:45 -07:00
Erik Johnson	1f0288e633	Prevent lookup error when trying to lookup fileserver function from LazyDict ... This prevents an unnecessary failed lookup, which as of the fluorine release cycle will result in an error being logged.	2018-09-05 22:13:30 -05:00
Gareth J. Greenaway	5ec5578fe1	Disable various boto tests when run under python 3.7 because of //github.com/spulec/moto/issues/1706. which was causing the test suite to hang on unit tests.	2018-09-05 19:47:21 -07:00
Erik Johnson	bbb8fe8540	Fix _get_hash in splay executor ... You can't pass a unicode value to bytearray()	2018-09-05 16:09:07 -05:00
Nicole Thomas	f73f2e5bb6	Merge pull request #49511 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2018.3.3 to 2018.3	2018-09-05 15:52:24 -04:00
rallytime	3ffc6c2520	Merge branch '2018.3.3' into '2018.3' ... Conflicts: - tests/integration/states/test_file.py - tests/support/helpers.py - tests/whitelist.txt	2018-09-05 09:34:27 -04:00
Nicole Thomas	81a49a82e9	Merge pull request #49500 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-09-04 15:02:30 -04:00
Nicole Thomas	87d3dfe085	Merge pull request #49499 from rallytime/pin-cherrypy-2018.3.3 ... Pin CherryPy version to < 18.0.0 in requirements files for PY2	2018-09-04 14:52:43 -04:00
Nicole Thomas	16ca360d1e	Merge pull request #49497 from rallytime/bp-49473 ... Back-port #49473 to 2018.3	2018-09-04 14:44:24 -04:00
rallytime	2317b5ef58	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/client/ssh/__init__.py - tests/integration/modules/test_win_ntp.py	2018-09-04 12:01:38 -04:00
rallytime	1aa3935c11	Lint: Add range import from six	2018-09-04 11:04:30 -04:00
rallytime	9e274335a3	Pin CherryPy version to < 18.0.0 in requirements files for PY2 ... Version 18.0 now requires Python 3.5, so we need to pin this for Py2.	2018-09-04 10:51:12 -04:00
rallytime	d06f6a5d3e	Use correct and explicit paths for salt utils libs	2018-09-04 10:02:34 -04:00
Daniel Wozniak	93df5c4f16	Merge pull request #49474 from dwoz/gitfs_unit ... Work around git-python resource leaks	2018-09-02 12:42:31 -07:00
Daniel Wozniak	1cdaea22b0	Merge pull request #49475 from dwoz/flaky_tests ... Fix a flaky test and mark another as flaky	2018-09-02 12:40:29 -07:00
Mike Place	43ead5d1bc	Merge pull request #49471 from Ch3LL/debug_sigusr1 ... Remove string conversion on frame object in sigusr1 handler	2018-09-02 12:05:12 -06:00
Daniel Wozniak	56068e9cd9	Merge branch '2018.3' into gitfs_unit	2018-08-31 15:55:52 -07:00
Nicole Thomas	764b816687	Merge pull request #49454 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-08-31 17:36:33 -04:00
Daniel A. Wozniak	f214929740	Fix a flaky test and mark another as flaky	2018-08-31 20:20:10 +00:00
Daniel A. Wozniak	e697ddce76	Work around git-python resource leaks ... Git python keeps file handles open on repositories. This does not see to effect tests outside of python3 on widows. For now, use a new temporary for each test on python3 windows.	2018-08-31 20:17:42 +00:00
Nicole Thomas	4ea22e59ef	Merge pull request #49025 from twangboy/fix_48661 ... Fix several issues with LGPO	2018-08-31 14:25:33 -04:00
Nicole Thomas	dd9ec949af	Merge pull request #49283 from aarnaud/fix-etcd-cache ... Fix #49281 etcd_cache with mine cache	2018-08-31 14:24:22 -04:00
rallytime	a97a7b0d08	Fix lint and test failures caused by bad merge	2018-08-31 14:08:58 -04:00
Nicole Thomas	39fdacc434	Merge pull request #49467 from rallytime/bp-49451 ... Back-port #49451 to 2018.3.3	2018-08-31 13:38:08 -04:00
Nicole Thomas	37d1455d69	Merge pull request #49468 from rallytime/bp-49291-and-49331 ... Back-port #49291 and #49331 to 2018.3.3	2018-08-31 13:37:29 -04:00
Ch3LL	1631b2feb3	Remove string conversion on frame object in sigusr1 handler	2018-08-31 12:36:42 -04:00
Mike Place	4ac4305c18	Merge pull request #49457 from rallytime/labels-docs ... Remove references to unused milestones in docs	2018-08-31 08:46:50 -06:00
Daniel A Wozniak	944f8e96c8	Use salt.utils to ensure string type	2018-08-31 10:21:14 -04:00
Daniel A. Wozniak	6c92ed2021	Fix review nits	2018-08-31 10:19:16 -04:00
Daniel A. Wozniak	0e18b157e3	Re-factor dedent to fix warts ... - textwarp.dedent does not support bytes on py3 - make sure to preserve trailing newlines	2018-08-31 10:19:11 -04:00
Daniel A. Wozniak	b5034067f8	Use salt.utils.to_* functions	2018-08-31 10:19:04 -04:00
Daniel A. Wozniak	6399d035a4	Add dedent that sets line endings	2018-08-31 10:18:55 -04:00
Daniel Wallace	b891a0a8d3	add lock for proxy minion process too	2018-08-31 10:06:56 -04:00
Daniel Wallace	72519878c0	start thread in try block	2018-08-31 10:06:56 -04:00
Daniel Wallace	b878f01662	use finally instead of catching baseexception	2018-08-31 10:06:55 -04:00
Daniel Wallace	de98be6093	use rlock so blocking can be passed in py2	2018-08-31 10:06:55 -04:00
Daniel Wallace	d346b42332	import Callable from collections.abc for python3.7 ... https://bugs.python.org/issue25988	2018-08-31 10:06:55 -04:00
Daniel Wallace	d7a410070a	Handle thread shutdown on system exit ... Handle changes made for https://bugs.python.org/issue18966 in python 3.7	2018-08-31 10:06:55 -04:00
Nicole Thomas	41dcc3f408	Merge pull request #49461 from saltstack/revert-47100-ssh ... Revert "Allow for not being prompted to supply a password to deploy keys to a…"	2018-08-31 09:55:34 -04:00
Daniel Wozniak	64227f9d74	Merge pull request #49459 from dwoz/batch_fix ... Batch test fix cherry-pick	2018-08-30 16:02:12 -07:00
Daniel Wozniak	75285a34d7	Merge pull request #49453 from dwoz/conffix ... Fix up py3 git config tests	2018-08-30 15:00:19 -07:00