98551 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	6e15bc58ff	Remove duplicate policy (fixes lint)	2018-10-19 15:23:02 -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
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
rallytime	c46cccbebf	Remove unused imports	2018-10-18 11:07:24 -04:00
rallytime	82e73fe49d	Merge branch '2018.3' into 'fluorine' ... Conflicts: - doc/ref/tops/all/index.rst - salt/fileclient.py - salt/grains/core.py - salt/modules/win_file.py - salt/pillar/__init__.py - salt/utils/http.py	2018-10-18 10:41:42 -04:00
Cédric Bosdonnat	61937feeb9	test_virt pylint fix	2018-10-18 15:23:33 +02:00
Cédric Bosdonnat	9e61d86303	virt: allow creating or updating VM with no nic or disk ... Some users may want to create a VM with no network interface at all, or remove all network interfaces from an existing one. This commit allows this in the virt.init and virt.update functions. For the sake of consistency, the same behavior has been applied to disks as well... even though it makes no sense to have a VM with no disk at all.	2018-10-18 15:23:24 +02:00
Mike Place	5123488dc2	Merge pull request #50013 from Giandom/2018.3 ... Passed kwargs to db_exists in db_remove method	2018-10-18 13:28:29 +02:00
Mike Place	f7f8cb533f	Merge pull request #50094 from rallytime/doc-errs ... Fix varstack_top naming in docs	2018-10-18 12:49:24 +02:00
twangboy	223c4f28b3	Merge Forward 49872 to Fluorine ... https://github.com/saltstack/salt/pull/49872	2018-10-17 16:45:32 -06:00
Nicole Thomas	aa94f6009d	Merge pull request #50092 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-10-17 15:57:06 -04:00
Nicole Thomas	c3387a70bf	Merge pull request #50093 from rallytime/flaky-lxd-tests ... Mark lxd_container integration tests as flaky	2018-10-17 15:45:36 -04:00
Nicole Thomas	d1f2c5d47e	Merge pull request #50082 from garethgreenaway/50073_fixing_typo_boto_cloudfront ... [2018.3] Fixing a typo in the boto_cloudfront	2018-10-17 15:34:59 -04:00
Nicole Thomas	d0c68df885	Merge pull request #49878 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-10-17 13:58:31 -04:00
rallytime	1fbb84d934	Fix varstack_top naming in docs ... Warnings were generated in the doc builds about how `varstack` doesn't exist. The file is named `varstack_top`.	2018-10-17 10:31:45 -04:00
rallytime	045bb0df1d	Mark lxd_container integration tests as flaky	2018-10-17 10:28:17 -04:00
rallytime	8609064f30	Update old utils paths to use new paths	2018-10-17 10:24:26 -04:00
rallytime	a984ad8b3d	Merge branch '2017.7' into '2018.3' ... No conflicts.	2018-10-17 10:21:42 -04:00
Nicole Thomas	7ec3840d25	Merge pull request #49794 from twangboy/fix_groupadd_test ... Fix possible issue with test_groupadd	2018-10-17 10:20:33 -04:00
Gareth J. Greenaway	e19f4c4958	Due to a previous PR the test_sdb_runner in sdb.test_vault was failing because of a exception that was being swallowed in the test run_run function. The cause was that when vault related functions were being run, if they were being run on the master then they were being forced to run through the _get_token_and_url_from_master() function, which is pull the id element out of the grains dictionary. When the call was taking place from a runner, the exception was popping up since there is no id when called from a runner. This fix checks to see if the id exists in the dictionary first, if it is there then _get_token_and_url_from_master() is called, otherwise _use_local_config is called.	2018-10-17 09:59:19 -04:00
Nicole Thomas	05bd2a0692	Merge pull request #50090 from garethgreenaway/fix_vault_sdb_runner_test ... [2018.3] Fix to utils/vault.py	2018-10-17 09:57:29 -04:00
Giandom	9c91df3630	Merge branch '2018.3' into 2018.3	2018-10-17 10:05:48 +02:00
Gareth J. Greenaway	444a4e525f	Merge branch '2018.3' into fix_vault_sdb_runner_test	2018-10-16 22:10:55 -07:00
Gareth J. Greenaway	6ef5ce4182	Due to a previous PR the test_sdb_runner in sdb.test_vault was failing because of a exception that was being swallowed in the test run_run function. The cause was that when vault related functions were being run, if they were being run on the master then they were being forced to run through the _get_token_and_url_from_master() function, which is pull the id element out of the grains dictionary. When the call was taking place from a runner, the exception was popping up since there is no id when called from a runner. This fix checks to see if the id exists in the dictionary first, if it is there then _get_token_and_url_from_master() is called, otherwise _use_local_config is called.	2018-10-16 17:38:56 -07:00
Nicole Thomas	7092879263	Merge pull request #50080 from terminalmage/issue49275 ... Ensure all string kwargs passed to Tornado's httpclient are str types	2018-10-16 17:01:40 -04:00
Gareth J. Greenaway	b5b90a1608	Fixing a typo in the boto_cloudfront.	2018-10-16 11:01:35 -07:00
Erik Johnson	4a6c327cba	Ensure all string kwargs passed to Tornado's httpclient are str types ... Failing to do so will result in a `TypeError` when running setopt in pycurl, as it does not support `unicode` types on Python 2.	2018-10-16 10:51:56 -05:00
Mike Place	a152f979aa	Merge pull request #50077 from rallytime/flaky-random-tests ... Add flaky decorator to random_org tests that occassionally fail	2018-10-16 17:35:57 +02:00
rallytime	305dc0118d	Add flaky decorator to random_org tests that occassionally fail	2018-10-16 11:14:12 -04:00
Mike Place	45b6da3ac4	Merge pull request #49811 from nhavens/optimize-firewalld-state ... Optimize firewalld state	2018-10-16 13:26:45 +02:00
Mike Place	06bb2453ba	Merge branch '2018.3' into 2018.3	2018-10-16 11:34:04 +02:00
Mike Place	e562838f5f	Merge pull request #50028 from basseed/fix-windows-virtual-grain ... Fix #50015, Windows grain defaults to physical as unix grain	2018-10-16 11:29:40 +02:00
Mike Place	abe894ddb1	Merge pull request #50030 from garethgreenaway/updating_sdb_test_vault ... [fluorine] Updates to integration.sdb.test_vault	2018-10-16 11:27:47 +02:00