95409 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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	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
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	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
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	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
Nicole Thomas	e9464c947e	Merge pull request #50423 from garethgreenaway/50292_no_error_log_test_true ... [2018.3] Fixes to sysctl modules and state	2018-11-08 09:12:59 -05:00
Gareth J. Greenaway	95a7f125a7	Adding file check and empty list return to freebsd_sysctl.py	2018-11-07 15:59:50 -08:00
Gareth J. Greenaway	469c090330	Adding a check to see if the config file exists, if not then return an empty list so we get the would be changes. Adding a test for this functionality.	2018-11-07 15:50:17 -08:00
rallytime	caace3f184	Rewrite job cache target test to be more robust	2018-11-07 17:01:06 -05:00
Gareth J. Greenaway	fccf875077	Merge pull request #50421 from weswhet/fix-mac_system-loader ... fixing an issue on mac_system where the virtual function wouldnt load	2018-11-07 13:57:43 -08:00
Nicole Thomas	7bc9b3d94a	Merge branch '2018.3' into 50311_pkg_installed_fails_sources_hold	2018-11-07 15:49:56 -05:00
Wesley Whetstone	042445d8f9	fixing an issue on mac_system where the virtual function wouldnt load	2018-11-07 11:15:12 -08:00
Pablo Suárez Hernández	71af32d31a	Remove unicode references	2018-11-07 16:55:55 +00:00
Pablo Suárez Hernández	b7af5e52c5	Test git ext_pillar across multiple repos using __env__	2018-11-07 16:33:03 +00:00
Pablo Suárez Hernández	59894e2c83	Resolve target branch when using __env__	2018-11-07 16:33:00 +00:00
Nicole Thomas	d2fc910d59	Merge pull request #50409 from casselt/mount-device_name_regex-test-mode-fix ... Fix test mode for mount state if device_name_regex is used.	2018-11-07 11:04:44 -05:00
Friedmund Lassmann	0113137a20	cwd needs to be passed from runas() to runas_system() ... Fixes parts of #47787	2018-11-07 15:06:39 +01:00
Friedmund Lassmann	20fff15e89	use exc.winerror not exc[0] to avoid python3 TypeError ... Fixes #50413	2018-11-07 12:49:49 +01:00
Torsten Casselt	56d5a32ca4	Fix test mode for mount state if device_name_regex is used. ... If mount.mounted is used for NFS or ceph-fuse, device_name_regex is often needed to avoid remounting every time. If run with test=True, Salt is always telling that it needs to remount while it is not remounting if run with test=False. This commit changes the order of checks to first check for a matching regex and then for the test mode and not the other way around.	2018-11-07 09:20:14 +01:00
Mike Place	c2fda9dd9c	Merge pull request #50383 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-11-06 08:51:52 -07:00
Mike Place	46c7dc2d90	Merge pull request #50236 from rallytime/fix-cloud-vt ... Fix salt-cloud UnicodeEncodeError when writing to stdout	2018-11-05 15:04:17 -07:00
Nicole Thomas	ed4fa8710b	Merge pull request #50382 from garethgreenaway/50062_max_event_size_does_not_always_trim_large_events ... [2018.3] Fix to utils/dicttrim.py to honor max_event_size with nested dictionaries	2018-11-05 15:04:05 -05:00
Nicole Thomas	493d6538bc	Merge pull request #50387 from rallytime/bp-50339 ... Back-port #50339 to 2018.3	2018-11-05 15:03:14 -05:00
Mike Place	ef4509e779	Merge pull request #50370 from dwoz/pubd_msg_logs ... Log message flow to publish daemon	2018-11-05 12:32:01 -07:00
Gareth J. Greenaway	039f3d1622	Increase limit for trimming.	2018-11-05 11:22:20 -08:00
Nicole Thomas	a3f264d940	Lint: Add extra blank line	2018-11-05 14:22:01 -05:00
Bart Laarhoven	bd18412740	The driver requires dependency, not the other way around. ... Updated a very annoying (personal opinion) incorrect error message.	2018-11-05 14:21:52 -05:00