92981 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
rallytime	9a0f4d190a	Update release versions for the 2017.7 branch	2018-06-13 09:47:12 -04:00
Nicole Thomas	d6d2c5ee18	Merge pull request #48075 from garethgreenaway/48038_jobs_are_not_deduping_minion_side ... [2017.7] Ensure that the shared list of jids is passed	2018-06-13 09:25:34 -04:00
Nicole Thomas	b10b7355a0	Merge pull request #48054 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-06-13 08:58:45 -04:00
Nicole Thomas	c83818e4f9	Merge pull request #48060 from gtmanfred/2018.3 ... mark test as expensive	2018-06-13 08:58:20 -04:00
Erik Johnson	248467edac	Add regression test for _generate_minion_id()	2018-06-13 01:13:43 -05:00
Erik Johnson	5e62d6d45f	Fix UnicodeDecodeError when parsing hosts file with non-ascii	2018-06-13 01:12:58 -05:00
Erik Johnson	e6a4744f85	Use errno instead of hard-coding error 2	2018-06-13 01:11:55 -05:00
Erik Johnson	ff63f36932	Fixes / enhancements for mock_open ... This makes the following changes: 1. Now works properly when read_data is a bytestring 2. Now works properly when mocked filehandle is iterated (e.g. `for line in fh:`) 3. Adds ability to make mocked filehandle raise an IOError when the path being opened doesn't match a pattern (or one of a list of patterns).	2018-06-13 01:05:44 -05:00
twangboy	0e99dd741c	Fix logic for non-root	2018-06-12 17:45:19 -06:00
twangboy	2d2534a688	Fix parsers for Windows, fix tests	2018-06-12 17:26:40 -06:00
Gareth J. Greenaway	914935c4d4	Merge branch '2018.3' into 2018.3	2018-06-12 14:59:38 -06:00
Nicole Thomas	aa33cc0b0c	Merge pull request #48071 from terminalmage/gitfs-docs ... Fix inaccurate gitfs_saltenv example in GitFS Walkthrough	2018-06-12 16:34:12 -04:00
Gareth J. Greenaway	c537b3275b	Ensure that the shared list of jids is passed when creating the Minion. Fixes an issue when minions are pointed at multiple syndics.	2018-06-12 13:07:44 -07:00
Nicole Thomas	fb4ceacb88	Merge pull request #48053 from rallytime/bp-48040 ... Back-port #48040 to 2017.7	2018-06-12 10:46:11 -04:00
Erik Johnson	24545204b3	Fix inaccurate gitfs_saltenv example in GitFS Walkthrough	2018-06-12 09:25:53 -05:00
Daniel Wallace	f37dcaac6d	Merge pull request #48024 from gtmanfred/2017.7 ... add pytest coverage and xml junits	2018-06-12 09:03:25 -05:00
Daniel Wallace	d8c035e5e5	mark test as expensive ... This tests takes a large amount of cpu to run, and is causing tests to hang. Mark it as an expensive test so it only runs with the cloud tests.	2018-06-11 16:08:10 -05:00
Nicole Thomas	a4eb41623d	Merge pull request #48057 from terminalmage/docs-2018.3 ... Fix link without target in 2018.3.0 release notes	2018-06-11 14:50:16 -04:00
Erik Johnson	20f71ff6f6	Fix link without target in 2018.3.0 release notes	2018-06-11 12:01:34 -05:00
rallytime	508d70fabf	Update old utils paths to use new paths	2018-06-11 11:49:10 -04:00
rallytime	3d2ea16c3a	Merge branch '2017.7' into '2018.3' ... Conflicts: - requirements/base.txt - salt/states/archive.py - salt/states/file.py - tests/integration/runners/test_state.py - tests/unit/daemons/test_masterapi.py	2018-06-11 11:45:37 -04:00
Todd Wells	265b22b194	states/github.py fix for incorrect positional argument	2018-06-11 11:23:58 -04:00
Nicole Thomas	0f9a3122df	Merge pull request #48042 from terminalmage/salt-jenkins-1000 ... Switch to trace level logging for further test failure troubleshooting	2018-06-11 10:03:47 -04:00
Nicole Thomas	ffee3576ec	Merge pull request #48044 from twangboy/wua_add_fail_code ... Add fail code for WinHTTP send/receive error	2018-06-11 09:49:28 -04:00
Nicole Thomas	6c5389189a	Merge pull request #48041 from terminalmage/hashutils-fix-windows ... salt.utils.hashutils: Only decode to utf-8 on Windows	2018-06-11 09:31:40 -04:00
twangboy	d41d0c25eb	Add faile code for WinHTTP send/receive error	2018-06-08 17:31:43 -06:00
Erik Johnson	b33a0b5eaa	Switch to trace level logging for further test failure troubleshooting	2018-06-08 17:06:49 -05:00
Erik Johnson	58c7cd33d7	salt.utils.hashutils: Only decode to utf-8 on Windows ... We only decode to unicode so that we can use some of these functions in Jinja filters. Since CP1252 will incorrectly decode certain bytestrings, force utf8 decoding on Windows.	2018-06-08 16:46:05 -05:00
Nicole Thomas	871a910fcb	Merge pull request #48009 from dwoz/winswarmfix ... minionswarm runs on windows	2018-06-08 09:52:35 -04:00
Nicole Thomas	dcae209951	Merge pull request #48014 from cro/find_job_pause ... Find job pause	2018-06-08 09:48:44 -04:00
Daniel Wallace	56b074ab27	allow specifying a different state to run on converge	2018-06-07 15:49:54 -05:00
Daniel Wallace	cc9c4b4d5a	add pytest coverage and xml junits	2018-06-07 12:53:22 -05:00
Mike Place	ea85f882bc	Merge pull request #47915 from garethgreenaway/state_runner_pause_resume_kill ... [2018.3] state runner pause resume kill	2018-06-07 10:08:29 -06:00
Nicole Thomas	5c11fcde60	Merge pull request #48002 from rallytime/bp-47923 ... Back-port #47923 to 2018.3	2018-06-07 11:25:38 -04:00
Nicole Thomas	3d0a087c71	Merge pull request #48003 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-06-07 11:25:19 -04:00
Nicole Thomas	440aa67c4f	Lint: Add blank line	2018-06-07 11:19:37 -04:00
Nicole Thomas	0a05212f60	Merge pull request #48022 from morganwillcock/patch-1 ... win_wua state: fix function name in examples	2018-06-07 11:03:51 -04:00
Nicole Thomas	406efb161e	Merge pull request #48015 from garethgreenaway/47546_more_unicode_nonsense ... [2018.3] more unicode nonsense in archive module	2018-06-07 10:44:54 -04:00
Morgan Willcock	443f4d6f21	win_wua state: fix function name in examples ... Changes 'up_to_date' to 'uptodate'	2018-06-07 15:34:59 +01:00
Gareth J. Greenaway	f457f9cb84	Adding a test to ensure archive.list returns the right results when a tar file contains a file with unicode in it's name.	2018-06-06 21:23:28 -07:00
Gareth J. Greenaway	9af49bc595	Ensure member names are decoded before adding to various lists.	2018-06-06 21:23:27 -07:00
C. R. Oldham	7b0e99a511	One more case where returner doesn't respond	2018-06-06 21:25:08 -06:00
C. R. Oldham	5abeedf882	Catch two cases when a returner is not able to be contacted--these would throw a stacktrace.	2018-06-06 21:07:00 -06:00
Nicole Thomas	0dcaead36d	Merge pull request #47968 from gtmanfred/2017.7 ... Clean up tox + pytest	2018-06-06 17:23:51 -04:00
Daniel A Wozniak	5027c7bb84	minionswarm runs on windows	2018-06-06 14:19:16 -07:00
Gareth J. Greenaway	2ecbe9c034	fixing typo in alias_function call.	2018-06-06 13:52:45 -07:00
Gareth J. Greenaway	4377e0cc08	Some fixes to the set_pause and rm_pause function in the state runner, renaming to in line with the functions in the state module. Including aliases to previous names for back-ward compatibility. Including a soft_kill function to kill running orchestration states. A new test to test soft_kill functionality.	2018-06-06 13:52:45 -07:00
Daniel Wozniak	1ce7d6c38a	Merge pull request #47989 from dwoz/awscloud ... Properly decode password from aws using m2crypto	2018-06-06 13:44:28 -07:00
Nicole Thomas	76068c83f5	Merge pull request #47976 from terminalmage/salt-jenkins-1000 ... Capture and log output of processes that timed out and were killed	2018-06-06 15:17:08 -04:00
Nicole Thomas	42dd6b83eb	Merge pull request #47978 from twangboy/fix_test_pkg ... Add try/finally, fix typo in 7zip def file	2018-06-06 15:06:03 -04:00