99017 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	ab8e8450c7	Merge pull request #50329 from twangboy/fix_cloud_winrm ... Check WinRM port before initiating connection	2018-11-01 09:06:41 -04:00
Gareth J. Greenaway	6e96728b52	pkg.installed currently fails when sources is used along with hold: True. This was due to a change in #48426 that swapped out sending the pkgs variable for the desired variable instead. This caused problems with pkg.hold because desired and sources are always populated, and pkg.hold can only include one or the other. This change just includes desired in the call to pkg.hold since desired has the same value for sources.	2018-10-31 15:50:55 -07:00
Anthony Shaw	529687a855	update test assertions	2018-11-01 08:41:53 +11:00
Mike Place	af1075b26d	Merge pull request #50290 from twangboy/fix_test_state ... Fix `test_state` for Windows	2018-10-31 20:28:33 +01:00
Mike Place	e463d99b3b	Merge branch '2018.3' into bp-49752	2018-10-31 20:24:09 +01:00
Mike Place	045d81c9d3	Merge pull request #50291 from rallytime/bp-50230 ... Back-port #50230 to 2018.3	2018-10-31 20:22:24 +01:00
rallytime	b29fcfabbb	New test must be py3 compatible...oops. :)	2018-10-31 12:52:58 -04:00
twangboy	cf5fb04c04	Check WinRM port before initiating connection	2018-10-31 10:50:42 -06:00
rallytime	c684c298ff	Fix issue #48734 ... A regression was caused in the local_cache returner with PR #43454. PR #43454 fixes an issue where `jobs.lookup_jid` was not working correctly with external job caches. However, when this issue was fixed, there was a slight logic error that was overlooked for the local_cache. This fixes the issue with the local_cache so that the "Target" and "Target Type" data is restored to their previous values.	2018-10-31 12:03:41 -04:00
rallytime	6859e0e6e2	Add regression test for issue #48734	2018-10-31 12:03:14 -04:00
Nicole Thomas	00437aa9c4	Merge pull request #50315 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2018.3.3 to 2018.3	2018-10-31 10:16:33 -04:00
Nicole Thomas	01708258ba	Merge pull request #50322 from twangboy/fix_test_cp ... Un-fix path seperators for Windows	2018-10-31 10:09:49 -04:00
twangboy	5fe46d22f9	Un-fix path seperators for Windows	2018-10-30 16:04:29 -06:00
Anthony Shaw	ba526ad149	remove unused import	2018-10-30 14:38:22 -04:00
Anthony Shaw	220e57f848	create 2 simple unit tests for the netyang state module and fix issue in #47425	2018-10-30 14:38:22 -04:00
Anthony Shaw	20bf3067b9	reproduce bug in 47425	2018-10-30 14:38:22 -04:00
rallytime	422465e53c	Merge branch '2018.3.3' into '2018.3' ... No conflicts.	2018-10-30 14:36:46 -04:00
Nicole Thomas	f652633241	Merge pull request #50312 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-10-30 13:45:29 -04:00
Nicole Thomas	e535b3846c	Merge pull request #50252 from dwoz/backport_fs_fix ... [2017.7] backport - Do not allow age to be a negative number	2018-10-30 12:31:10 -04:00
Nicole Thomas	3f4a4bccc9	Merge pull request #50256 from garethgreenaway/porting_50216_to_fluorine ... [fluorine] Porting #50216 to fluorine	2018-10-30 12:28:49 -04:00
Nicole Thomas	1aae681229	Merge branch '2018.3' into bp-50230	2018-10-30 12:26:15 -04:00
rallytime	77b4379a99	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/modules/aptpkg.py - tests/integration/cloud/clouds/test_ec2.py	2018-10-30 12:23:39 -04:00
Mike Place	84ee7a3038	Merge pull request #50309 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-10-30 17:07:24 +01:00
rallytime	381a59d56e	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/states/pip_state.py - tests/integration/cloud/clouds/test_ec2.py	2018-10-30 11:41:18 -04:00
Nicole Thomas	b805bab25c	Merge pull request #50308 from rallytime/test-fixes ... Fix matcher grain file	2018-10-30 11:27:46 -04:00
Nicole Thomas	11fa33e41d	Merge pull request #50295 from dubb-b/remove-cloud-change ... Removing an un needed change and maybe fixing the lint error	2018-10-30 11:27:22 -04:00
rallytime	f23852207f	Fix matcher grain file ... This was inadvertently changed in th filename_map backport. This commit restores the matcher grain file to match all branches previous to the inadvertent change.	2018-10-30 09:51:51 -04:00
Nicole Thomas	32322677c7	Merge pull request #50298 from twangboy/fix_nacl_util ... Add missing return to secretbox_decrypt()	2018-10-30 09:27:00 -04:00
Nicole Thomas	4c86d0f40d	Merge pull request #50299 from gtmanfred/ansible ... mark ansiblegate test as flaky	2018-10-30 09:25:00 -04:00
Nicole Thomas	57fe6cdb18	Merge pull request #50270 from terrible-broom/feature/apt-cache-show-instead-of-dump ... apt: speedup installing packages with '>=' or '<=' and reduced memory…	2018-10-30 09:24:35 -04:00
Nicole Thomas	6c1b05ad9e	Lint: add extra blank line	2018-10-30 09:22:24 -04:00
Daniel Wallace	9746b894f1	mark ansiblegate test as flaky	2018-10-29 19:40:58 -05:00
Nicole Thomas	0fc090f6b4	Merge pull request #50285 from cbosdo/fluorine-backport ... virt disk fixes for fluorine	2018-10-29 20:28:44 -04:00
Daniel Wallace	6a65402dac	Merge pull request #50293 from saltstack/jenkins ... update jenkins version for 2018.3	2018-10-29 18:39:34 -05:00
twangboy	a1b8f84ebd	Add missing return to secretbox_decrypt()	2018-10-29 17:17:32 -06:00
Daniel Wallace	935f1815a2	Merge pull request #50289 from gtmanfred/2018.3 ... ignore empty line in localectl status output	2018-10-29 16:39:06 -05:00
twangboy	69c02fca4a	Fix some lint and some typos	2018-10-29 15:34:48 -06:00
Brett Benassi	80982ada82	Removing an un needed change and maybe fixing the lint error	2018-10-29 15:30:51 -06:00
Daniel Wallace	fe6fbc43d7	update jenkins version for 2018.3	2018-10-29 16:05:34 -05:00
Anna Martynova	a4df706d1d	fix review notes	2018-10-29 23:57:07 +03:00
rallytime	1ef712a178	Add various ssh tests to the filemap for salt/utils/vt.py changes ... Some of the salt-ssh tests use the salt/utils/vt.py functions. A recent change in that file caused about 90 tests to start failing on the branch. We need to make sure these tests run when changes to the vt.py util are made in PRs.	2018-10-29 16:40:23 -04:00
Nicole Thomas	df0ccefaa8	Merge pull request #50283 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-10-29 16:36:39 -04:00
twangboy	d18401370e	Fix typo	2018-10-29 14:15:07 -06:00
twangboy	92b5ea023e	Create salt util that copies file security info	2018-10-29 14:06:30 -06:00
rallytime	d6af1bb8d7	Remove the test_custom_grains integration file ... This file has been renamed for the filename_map functionality.	2018-10-29 16:02:35 -04:00
rallytime	274697d0b3	Remove the test_saltclass_list_expasion unit test file ... The tests contained in this file have been moved to the test_saltclass unit test file. This is necessary for filename_map to work correctly.	2018-10-29 15:53:11 -04:00
rallytime	0d23e5aa16	Remove test_pgjsonb_return unit test file ... This file has been renamed for the filename_map functionality.	2018-10-29 15:51:32 -04:00
rallytime	2c6078613b	Remove beacon unit tests that end with *_beacon.py ... These have all been renamed for the filename_map functionality.	2018-10-29 15:49:11 -04:00
Daniel Wallace	fb43061cb1	fix test	2018-10-29 14:45:23 -05:00
Daniel Wallace	5eb0e37f4e	add extra space to localemod test	2018-10-29 14:31:36 -05:00