99017 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	2df3d88e6f	Merge pull request #50240 from twangboy/fix_test_file ... Fix `integration.states.test_file` on Windows	2018-10-26 09:27:22 -04:00
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
twangboy	314a699519	Ensure proper line ending	2018-10-25 15:31:06 -06:00
rallytime	c1984c9320	Fix salt-cloud UnicodeEncodeError when writing to stdout ... This is a partial back-port of #50146. The full back-port was reverted due to the original change causing all of the salt-ssh tests to fail. This change fixes the salt-cloud error, but allows salt-ssh to work correctly. Refs #49523, #50146, #50174, #50231, and #50235	2018-10-25 17:28:51 -04:00
Nicole Thomas	fe9bc8170b	Merge pull request #50233 from Ch3LL/bp-50232 ... [2017.7] Backport #50232	2018-10-25 16:56:26 -04:00
Ch3LL	f83460da62	change order of search engine ids	2018-10-25 16:47:46 -04:00
Ch3LL	bf3f21721e	Update search engine IDs for releases	2018-10-25 16:47:41 -04:00
rallytime	d8e5e9ea49	Merge branch '2018.3' into 'fluorine' ... No conflicts.	2018-10-25 16:16:10 -04:00
Megan Wilhite	ab0b022fee	Merge pull request #50232 from Ch3LL/search_latest ... Update search engine IDs for releases	2018-10-25 16:15:06 -04:00
Nicole Thomas	1c8cdf985f	Merge pull request #50231 from saltstack/revert-50174-bp-50146 ... Revert "Back-port #50146 to 2018.3"	2018-10-25 16:12:14 -04:00
Ch3LL	3452d9bf01	change order of search engine ids	2018-10-25 16:11:35 -04:00
Ch3LL	c9546dfb08	Update search engine IDs for releases	2018-10-25 16:10:15 -04:00
Nicole Thomas	c76ac1b7b8	Revert "Back-port #50146 to 2018.3"	2018-10-25 15:55:27 -04:00
Ethan Culler-Mayeno	283d41c16c	Merge branch '2017.7' into fix-minion-return-exception-with-return	2018-10-25 09:06:41 -07:00
Daniel Wallace	f485b4afae	enable testing only filemaps	2018-10-25 11:17:03 -04:00
rallytime	dfa05b978e	Remove test files for beacons that don't exist in 2018.3	2018-10-25 11:16:11 -04:00
rallytime	8fed338708	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/spm/pkgfiles/local.py - salt/utils/schedule.py - tests/integration/scheduler/test_eval.py	2018-10-25 10:31:06 -04:00
Nicole Thomas	8dd4f43aec	Merge pull request #50172 from rallytime/bp-50140 ... Back-port #50140 to 2018.3	2018-10-25 10:00:31 -04:00
Nicole Thomas	f0cd8478d2	Merge pull request #50021 from twangboy/add_grains ... Add a `windowsdomaintype` grain	2018-10-25 09:45:38 -04:00
Nicole Thomas	9ad43f2b71	Merge pull request #50063 from twangboy/fix_50039 ... Use long when setting REG_QWORD	2018-10-25 09:45:02 -04:00
Nicole Thomas	01b083e20b	Merge pull request #50188 from garethgreenaway/49965_beacon_diskusage_windows ... [2018.3] fixes to diskusage beacon	2018-10-25 09:41:18 -04:00
Nicole Thomas	9ea51c00bd	Merge pull request #50214 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-10-25 09:38:39 -04:00
Nicole Thomas	51b3fa4bb6	Merge pull request #50216 from garethgreenaway/50162_when_plus_splay_endless_loop ... [2018.3] Fixes to scheduler, list of whens plus splay	2018-10-25 09:31:25 -04:00
Gareth J. Greenaway	685509fae3	Fixing an issue when a combination of the when parameter as a list plus using the splay parameter would cause the schedule to continuously run jobs in an endless loop, regardless of if their scheduled time had been receached. Also fixing a related issue where scheduled jobs that rely on _next_fire_time were not being run as the corrected splayed time but rather running at the original scheduled time. Adding new tests.	2018-10-24 17:22:37 -07:00
Daniel Wozniak	43303fb6cd	Merge pull request #50190 from dwoz/grains_template_test ... Fix test_managed_file_with_grains_data on Windows	2018-10-24 15:43:35 -07:00
rallytime	897145c4a1	Merge branch '2017.7' into '2018.3' ... No conflicts.	2018-10-24 15:54:15 -04:00
Nicole Thomas	462314b286	Merge pull request #50187 from garethgreenaway/port_49871_to_2018_3 ... [2018.3] Adding fixes to scheduler tests to 2018.3	2018-10-24 15:45:31 -04:00
Nicole Thomas	8ad9a1bd61	Merge pull request #50201 from Ch3LL/_2018.3.3 ... [2018.3] Ensure that tokens are hex to avoid hanging/errors in cherrypy	2018-10-24 15:44:23 -04:00
Nicole Thomas	017d39400a	Merge pull request #50202 from Ch3LL/_2017.7.8 ... [2017.7] Ensure that tokens are hex to avoid hanging/errors in cherrypy	2018-10-24 15:42:11 -04:00
Nicole Thomas	f28a4fa1a6	Merge pull request #50211 from channias/fix-spm-modules-install ... Fix broken install of additionnal modules in SPM packages	2018-10-24 15:41:22 -04:00
Nicole Thomas	6b4e07be03	Merge pull request #50212 from dwoz/test_no_fail ... Do not fail if process already ended	2018-10-24 15:22:46 -04:00
twangboy	5fdba7d0ee	Disable lint error	2018-10-24 11:49:01 -06:00
twangboy	84b8dd6856	Add tests	2018-10-24 11:49:01 -06:00
twangboy	4644bb63f2	Use long when setting REG_QWORD	2018-10-24 11:49:01 -06:00
twangboy	be6a6ac1a5	Skip test that is missing win32 libraries	2018-10-24 11:43:10 -06:00
Daniel A. Wozniak	7f613ac020	Do not fail if process already ended ... We can expect the subprocess has already ended by the time we're checking for child processes. Handle this case gracefully so that tests do not fail with an exception.	2018-10-24 10:17:59 -07:00
Nicolas Chancereul	9b203d544d	Fix broken install of additionnal modules in SPM packages ... Fixes #44554	2018-10-24 18:44:46 +02:00
Gareth J. Greenaway	1f0ab278f0	Merge branch '2018.3' into 49965_beacon_diskusage_windows	2018-10-24 09:42:36 -07:00
Gareth J. Greenaway	25e7cb61b4	Merge branch '2018.3' into port_49871_to_2018_3	2018-10-24 09:37:45 -07:00
Gareth J. Greenaway	d232dfb9b7	Update test_eval.py	2018-10-24 09:37:23 -07:00
Nicole Thomas	88673ad9e7	Merge pull request #50208 from Ch3LL/2update_version_doc_2018.3 ... Update release versions for the 2018.3 branch	2018-10-24 11:52:18 -04:00
Nicole Thomas	85e22d2f25	Merge pull request #50207 from Ch3LL/2update_version_doc_2017.7 ... Update release versions for the 2017.7 branch	2018-10-24 11:51:12 -04:00
Nicole Thomas	db8ef1efa7	Merge pull request #50206 from Ch3LL/rn_2018.3.3 ... [2018.3.3] remove in progress and add security details	2018-10-24 11:50:49 -04:00
Daniel Wallace	3d3db70454	Merge pull request #50200 from rallytime/bp-50181 ... Back-port #50181 to 2018.3	2018-10-24 10:49:57 -05:00
Nicole Thomas	d0356955e5	Merge pull request #50205 from Ch3LL/rn_2017.7.8 ... [2017.7.8] remove in progress and add security details	2018-10-24 11:49:51 -04:00
C. R. Oldham	f3e5399cc4	Ignore testinfra 1.17.0	2018-10-24 11:38:24 -04:00
Ch3LL	896caa120f	Add 2016.11.10 release notes to 2018.3 branch	2018-10-24 11:08:38 -04:00
Ch3LL	cdbf493400	Add 2017.7.8 previous release	2018-10-24 10:39:04 -04:00