99019 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	360ae6a955	Merge pull request #50481 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-11-12 17:44:14 -05:00
Erik Johnson	0f02da7fec	Remove unnecessary u prefix from string literals ... These are redundant with unicode_literals being used	2018-11-12 16:45:28 -05:00
Erik Johnson	fc26ae8ea3	Add unit test for comparing containers with the same env vars	2018-11-12 16:45:22 -05:00
Joanna Yurdal	cf7cb4beeb	extra blank line after function definition(pylint)	2018-11-12 16:45:14 -05:00
Joanna Yurdal	1de9ce382d	Compare sorted docker environment	2018-11-12 16:45:08 -05:00
rallytime	c7ebb7f96d	Merge branch '2018.3' into 'fluorine' ... No conflicts.	2018-11-12 16:20:41 -05:00
rallytime	1517bb31a8	Update old utils paths to use new paths	2018-11-12 16:13:35 -05:00
rallytime	d8e7c47a05	Merge branch '2017.7' into '2018.3' ... Conflicts: - tests/support/case.py	2018-11-12 16:11:17 -05:00
Daniel Wozniak	e5f97cdce0	Merge pull request #50467 from dwoz/test_kitchen_up ... Use patched version of test-kitchen until next upstream release	2018-11-12 10:12:14 -07:00
Nicole Thomas	b16ff9cd1c	Merge pull request #50469 from dwoz/minion_timeout_test ... Fix up integration.minion.test_timeout	2018-11-12 11:53:45 -05:00
Nicole Thomas	45b438e668	Merge pull request #50470 from dwoz/set_time_flaky ... Reset date and time after changing	2018-11-12 11:52:48 -05:00
Nicole Thomas	3aaad17c91	Merge pull request #50468 from garethgreenaway/50461_fix_elementary_os_family_grain ... [2018.3] Adding elementary override to grains/core.py	2018-11-12 11:41:56 -05:00
Erik Johnson	6143408507	Add unit test for TimedProc regression	2018-11-12 09:08:49 -06:00
Cédric Bosdonnat	4b628d2f66	virt.update: only compare NIC properties we handle ... virt.update compares NIC devices to guess if they need to be updated. It needs to allow changing the properties the user is inputing including mac and model. It also should not compare properties we don't handle: that could destroy vlan definitions or other important bits.	2018-11-12 14:12:10 +01:00
Daniel A. Wozniak	794ba17c94	Reset date and time after changing	2018-11-12 00:43:22 -07:00
Daniel A. Wozniak	57f702dc58	Fix linter warning	2018-11-11 21:49:20 -07:00
Daniel A. Wozniak	686153a77c	Fix up integration.minion.test_timeout ... This test wasn't able to be run on it's own. Fix it and add more debugging	2018-11-11 21:30:08 -07:00
Gareth J. Greenaway	77e8dcc91f	On later versions of elementary, the os_family is being populated as elementary. In order for the aptpkg module to function, we need to override is to be Debian.	2018-11-11 14:50:44 -08:00
Daniel A. Wozniak	8c5e93eaa4	Use patched version of test-kitchen until next release	2018-11-11 15:05:54 -07:00
Erik Johnson	e234abd9e0	Add support for list of commands in git states' onlyif/unless	2018-11-09 13:42:02 -06:00
Brett Benassi	fb614827bd	adding git	2018-11-09 11:55:28 -07:00
Brett Benassi	181b8a429e	removing stable	2018-11-09 11:53:45 -07:00
Brett Benassi	fc93ad6ebf	Adding the released version as the bootstrap minion.	2018-11-09 11:42:59 -07:00
Nicole Thomas	c51f3643c2	Merge pull request #50448 from cbosdo/fluorine-backport ... Fix virtual disk creation in update	2018-11-09 10:00:04 -05:00
Nicole Thomas	e6a285c3f6	Merge pull request #50440 from Ch3LL/mac_system_flaky ... Add attempts kwarg in flaky test decorator	2018-11-09 09:53:31 -05:00
Nicole Thomas	c74a47e1f1	Merge branch 'fluorine' into fluorine	2018-11-09 09:38:05 -05:00
Nicole Thomas	081b219912	Merge pull request #50390 from twangboy/fix_test_nacl ... Fix integration.runners.test_nacl on Windows Py3	2018-11-09 09:37:20 -05:00
Nicole Thomas	fe522b2b62	Merge branch 'fluorine' into fluorine-backport	2018-11-09 09:34:13 -05:00
Nicole Thomas	a921df0fb6	Merge pull request #50437 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-11-09 09:33:56 -05:00
Cédric Bosdonnat	819bd6aacd	Fix virtual disk creation in update ... Some disk devices like cdroms may have an empty source_file: handle it or we will fail when testing for the file presence.	2018-11-09 14:10:44 +01:00
Nicole Thomas	c85561ee56	Merge pull request #50442 from rallytime/replace-docbanner ... Update docbanner hyperlink	2018-11-08 17:10:32 -05:00
rallytime	193325d58a	Update docbanner hyperlink	2018-11-08 17:05:13 -05:00
Nicole Thomas	72005688e5	Merge pull request #50439 from rallytime/bootstrap-contributing-docs ... Add bootstrap section to contributing docs	2018-11-08 16:53:08 -05:00
Nicole Thomas	cca7a365cd	Merge pull request #50441 from rallytime/replace-docbanner ... Update SaltConf doc banner	2018-11-08 16:52:45 -05:00
rallytime	2af92bd647	Update SaltConf doc banner	2018-11-08 16:42:29 -05:00
Ch3LL	fa0c1b02e1	Add attempts kwarg in flaky test decorator	2018-11-08 16:30:05 -05:00
rallytime	d2158aa0fa	Add bootstrap section to contributing docs ... Fixes #34089	2018-11-08 16:03:19 -05:00
Mike Place	d9179fb5b2	Merge pull request #50333 from garethgreenaway/50311_pkg_installed_fails_sources_hold ... [2018.3] Fix to pkg.installed for sources and hold: True	2018-11-08 11:02:32 -07:00
Mike Place	193c80a3a2	Merge pull request #50434 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-11-08 10:40:38 -07:00
Mike Place	675a35959a	Merge pull request #50405 from twangboy/fix_test_decorators ... Fix integration.modules.test_decorators for Windows	2018-11-08 10:23:42 -07:00
Mike Place	73ce80f6e3	Merge pull request #50417 from meaksh/2018.3-fix-git_pillar-__env__-solving-for-merging ... Get the right target when using "__env__" on git ext_pillar to avoid merging problems	2018-11-08 10:07:02 -07:00
Mike Place	1e72d20f7d	Merge pull request #50414 from flassman/backmerge-for-typeerror-windows-python3 ... use exc.winerror not exc[0] to avoid python3 TypeError	2018-11-08 09:38:33 -07:00
Nicole Thomas	93095cbd45	Merge pull request #50415 from flassman/pass-cwd-to-runas_system ... cwd needs to be passed from runas() to runas_system()	2018-11-08 11:14:55 -05:00
Mike Place	352afc90bc	Merge pull request #50432 from cbosdo/fluorine-backport ... Update create disk fix	2018-11-08 09:03:17 -07:00
Erik Johnson	cbf05c8481	TimedProc: Don't assume args is a string ... Both a string and a list of args are supported	2018-11-08 10:02:38 -06:00
rallytime	b86ad94fb1	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/master.py - salt/transport/tcp.py	2018-11-08 10:44:10 -05:00
rallytime	83dfbb25bb	Merge branch '2017.7' into '2018.3' ... No conflicts.	2018-11-08 10:41:14 -05:00
rallytime	2c51cf9816	Make target test job more specific to reduce test flakiness	2018-11-08 10:27:41 -05:00
Erik Johnson	87de250993	Exit gracefully when mod_run_check raises exception	2018-11-08 09:26:22 -06:00
Cédric Bosdonnat	e6f5b66077	virt: fix pylint 2.x errors	2018-11-08 15:44:48 +01:00