98588 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
twangboy	c974db4e49	Revert some indenting	2018-10-25 17:18:57 -06:00
twangboy	593677ca82	Use the dedent helper function instead	2018-10-25 17:17:09 -06:00
twangboy	4cb7062fd7	Fix integration.states.test_file on Windows ... Fix hard-coded, unix-style line endings	2018-10-25 16:50:24 -06:00
Nicole Thomas	f0cd8478d2	Merge pull request #50021 from twangboy/add_grains ... Add a `windowsdomaintype` grain	2018-10-25 09:45:38 -04:00
twangboy	be6a6ac1a5	Skip test that is missing win32 libraries	2018-10-24 11:43:10 -06:00
twangboy	7e8d21456e	Add tests	2018-10-23 16:17:38 -06:00
twangboy	501ade2ed1	Add additional grains and system info ... Adds the `windowsdomaintype` grain Adds the get_join_info util to populate said grain Adds additional information to the output of `get_system_info` since we're already pulling the data anyway with the WMI call	2018-10-23 16:17:28 -06:00
Daniel Wallace	99ea25371d	Merge pull request #50178 from gtmanfred/pytest-fluorine ... remove extra imports	2018-10-23 11:29:25 -05:00
Daniel Wallace	209a1d0fa7	remove extra imports	2018-10-23 11:28:54 -05:00
Mike Place	ce6e5ed6d4	Merge pull request #50170 from rallytime/bp-win_runas-fix ... Skip the win_runas util test on non-windows	2018-10-23 08:37:48 -06:00
rallytime	1040f507cc	Lint fix: add skipIf import and remove unused import	2018-10-23 09:54:02 -04:00
Nicole Thomas	212a51ec6c	Merge pull request #50160 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-10-23 09:33:14 -04:00
rallytime	a46f9c3dcd	Skip the win_runas util test on non-windows	2018-10-23 09:20:41 -04:00
rallytime	b9f61323b5	Merge branch '2018.3' into 'fluorine' ... No conflicts.	2018-10-22 14:41:20 -04:00
Nicole Thomas	792a82a32f	Merge pull request #50133 from terminalmage/merge-fluorine ... Merge 2018.3 branch into fluorine	2018-10-22 11:26:49 -04:00
Mike Place	28bc5e351f	Merge pull request #50136 from terminalmage/debug-logging ... Add some debug logging before and after states gather pillar data	2018-10-22 08:40:38 -06:00
Mike Place	593c7ff085	Merge pull request #50147 from garethgreenaway/50129_network_get_route_fails_dash_in_name ... [2018.3] Fix to modules/network.py	2018-10-22 08:31:02 -06:00
Mike Place	5c7a7d97aa	Merge pull request #50156 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-10-22 08:24:38 -06:00
rallytime	87e20fd9a0	Merge branch '2017.7' into '2018.3' ... No conflicts.	2018-10-22 10:15:39 -04:00
Daniel Wallace	ce375f4ac3	Merge pull request #50148 from MTecknology/proxmox-fixups ... Proxmox fixups	2018-10-22 06:55:09 -05:00
Gareth J. Greenaway	8fa87e3dc9	Update test_network.py	2018-10-21 08:39:29 -07:00
Daniel Wallace	1a90c4fde2	Merge pull request #50144 from dwoz/winrm_fs_release ... Use newest winrm-fs release	2018-10-20 19:53:36 -05:00
Michael Lustfield	49599475b1	Race condition still exists at one second timeout.	2018-10-20 19:27:58 -05:00
Michael Lustfield	3a62f74758	Add support for setting root ssh pubkey to proxmox containers.	2018-10-20 19:03:40 -05:00
Gareth J. Greenaway	311796994b	Fixing scenario where the interface for the default route has a dash in it, regular expression used in get_route currently doesn't not account for this.. Adding some additional tests for network.get_route.	2018-10-20 15:57:25 -07:00
Daniel A. Wozniak	0951d85433	Use newest winrm-fs release	2018-10-20 14:22:55 -07:00
Erik Johnson	6e15bc58ff	Remove duplicate policy (fixes lint)	2018-10-19 15:23:02 -05:00
Erik Johnson	8592a0b90e	Add some debug logging before and after states gather pillar data ... This will help definitively identify instances where a salt-call is delayed because it is waiting for pillar data from the master.	2018-10-19 15:09:50 -05:00
Erik Johnson	c1dd362ce2	Merge remote-tracking branch 'upstream/2018.3' into merge-fluorine ... Conflicts: - salt/utils/schedule.py - tests/integration/scheduler/test_eval.py - tests/integration/scheduler/test_skip.py - tests/unit/modules/test_yumpkg.py	2018-10-19 13:56:46 -05:00
Daniel Wozniak	0ece06ef66	Merge pull request #50085 from dwoz/win_pkg_redux ... Fix `test_win_pkg` yet again	2018-10-19 11:16:15 -07:00
Mike Place	bfce09c2fe	Merge pull request #49937 from ssc-services/fix-virt-what-multiline-results ... Fix value of `virtual` grain when using `virt-what`	2018-10-19 07:27:42 -06:00
Mike Place	0069247ddf	Merge pull request #49980 from twangboy/lgpo_add_printer_drivers ... Add support for AddPrinterDrivers	2018-10-19 07:19:40 -06:00
Mike Place	dd75897a5e	Merge pull request #50103 from twangboy/mf_49872 ... Merge Forward 49872 to Fluorine	2018-10-19 05:50:11 -06:00
Mike Place	e2c39d7880	Merge pull request #50111 from cbosdo/fluorine-backport ... Fluorine backport of PR #50109	2018-10-19 05:47:05 -06:00
Mike Place	68bd12968a	Merge pull request #50112 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-10-19 05:46:34 -06:00
Mike Place	de23c83f54	Merge pull request #50114 from rallytime/bp-50061 ... Back-port #50061 to 2018.3	2018-10-19 05:46:02 -06:00
Mike Place	9188bec831	Merge pull request #50115 from garethgreenaway/apply_49104_to_2018_3 ... [2018.3] Apply scheduler fixes and tests from #49104 to 2018.3	2018-10-19 05:45:30 -06:00
Mike Place	e892042a67	Merge pull request #50119 from terminalmage/boto-tests ... Squelch spurious errors logged in unit tests	2018-10-19 05:42:30 -06:00
Mike Place	35449b4b14	Merge pull request #50120 from terminalmage/salt-jenkins-1137 ... Fix bad merge conflict resolution	2018-10-19 05:38:34 -06:00
Mike Place	98be3e78bc	Merge pull request #50121 from gtmanfred/fluorine ... mark log jid test as flaky	2018-10-19 03:54:15 -06:00
Elias Probst	08b1b17465	Add release notes for virtual grain fix	2018-10-19 01:03:25 +02:00
Elias Probst	4b5421a0f5	Fix value of virtual grain when using virt-what ... `virt-what` might return multiple lines, depending on what it detected (e.g. `lxc` inside a `HyperV` VM), where the last line corresponds to the most likely match. Until now, Salt evaluated the whole multi-line output as a single string, which caused quite inaccurate matches. This commit changes this behavior to only evaluate the last line of the `virt-what` output. A similar issue is described in #25697, but might actually have a different root cause.	2018-10-19 01:03:25 +02:00
Daniel Wallace	677b9bdfa4	mark log jid test as flaky	2018-10-18 14:54:09 -05:00
Erik Johnson	91812ff510	Squelch spurious errors logged in unit tests ... We are getting errors in the LazyLoader because certain functions are not present in the LazyDict due to being left out of the whitelist. These don't cause the tests to fail, but they do result in a lot of spurious errors in the test suite.	2018-10-18 14:01:28 -05:00
Erik Johnson	1ddfd26e9f	Fix bad merge conflict resolution ... b98df6d was incorrectly merged forward into 2018.3 (or into develop, before 2018.3 was branched). This causes failures to redeploy the thin tarball when it has changed, under certain circumstances. This commit fixes the problem. I'm also leaving in some changes to the logging that I made in the course of troubleshooting this, as they make the border between stdout and stderr more explicit, as well as adding the shim command's retcode.	2018-10-18 12:39:55 -05:00
Gareth J. Greenaway	adb1e79723	Apply scheduler fixes and tests from #49104 to 2018.3	2018-10-18 08:27:59 -07:00
Erik Johnson	1f09104b0d	Add unit test for pkg.install with epoch	2018-10-18 11:16:58 -04:00
zr	af253c6542	pkg.install bugfix	2018-10-18 11:15:42 -04:00
Mike Place	e0965603bf	Merge pull request #50113 from rallytime/bp-49989 ... Back-port #49989 to 2017.7	2018-10-18 17:14:22 +02:00
William Giokas	27c7ac94b7	Increase centos7-py2 kitchen pr timeout to 8 hours ... The centos7-py2 tests have been consistently failing to finish before the timeout. I am increasing the timeout for these tests to 8 hours in order to see if we can finish a few of them. They should get much closer to finishing as the branch tests have been finishing at around the 6:30 or 7:00 mark sometimes.	2018-10-18 11:11:59 -04:00