99017 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	569276bedf	Add an initial filename_map	2018-10-23 14:21:21 -05:00
Erik Johnson	44199b1d33	Add --from-filenames and --filename-map options to parser ... This allows for the passed filename(s) to decide which tests are run	2018-10-23 14:21:21 -05:00
Nicole Thomas	5f904dd5c5	Merge pull request #50174 from rallytime/bp-50146 ... Back-port #50146 to 2018.3	2018-10-23 14:16:44 -04:00
Mike Place	ce341f2424	Merge pull request #50180 from max-arnold/2017.7 ... Revert curly braces example for nested dictionaries	2018-10-23 12:00:56 -06:00
Mike Place	1cd033935e	Merge pull request #50173 from rallytime/bp-50143 ... Back-port #50143 to 2018.3	2018-10-23 11:13:54 -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
Max Arnold	881a521586	Revert curly braces example for nested dictionaries	2018-10-23 23:25:08 +07: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
Michael Lustfield	601a5b83fc	Improve handling of non-ascii characters in terminal output. (Fixes: #49523)	2018-10-23 10:32:51 -04:00
m03	f5d6080237	Add test_to_none	2018-10-23 10:30:31 -04:00
m03	c0ce36b918	Fix #50142, stringutils.to_none	2018-10-23 10:30:28 -04:00
Nicolas Lafont	02e0ea0f99	lint fix	2018-10-23 10:28:35 -04:00
Nicolas Lafont	819c46cb87	fix lint errors and code factorization	2018-10-23 10:28:31 -04:00
Nicolas Lafont	8aa35989ab	Fix lint error	2018-10-23 10:28:27 -04:00
Nicolas Lafont	9092c4e1ee	Adding support for XCP-ng	2018-10-23 10:28:21 -04:00
Nicolas Lafont	c516bc5199	Adding XCP-ng to os family map	2018-10-23 10:28:16 -04:00
rallytime	1040f507cc	Lint fix: add skipIf import and remove unused import	2018-10-23 09:54:02 -04:00
Nicole Thomas	9331f1e920	Merge pull request #50171 from terminalmage/docs ... Fix invalid RST link in docker_network docs	2018-10-23 09:40:35 -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
Nicole Thomas	16eece35c7	Merge pull request #50161 from rmarcinik/patch-1 ... Add a missing result for task.info	2018-10-23 09:31:42 -04:00
Erik Johnson	7ea1d6cdd3	Fix invalid RST link in docker_network docs	2018-10-23 08:24:24 -05:00
rallytime	a46f9c3dcd	Skip the win_runas util test on non-windows	2018-10-23 09:20:41 -04:00
Daniel Wallace	f634db4390	cache signing file data ... This will make it so that we don't have to read from the disk every time that a key reports, only if the mtime has changed.	2018-10-23 06:59:27 -05:00
Daniel Wallace	622bb51464	Merge pull request #50026 from damon-atkins/jenkins_pylint ... Jenkins CI Lint Improvements	2018-10-22 15:49:15 -05:00
Rigel Marcinik	9848f0692a	Add a missing result for task.info ... There is a possible value for Last Run Result in the windows task scheduler that is missing from the results dictionary. It raises a confusing KeyError from task.info if the task ends up in this state.	2018-10-22 14:23:20 -05:00
rallytime	b9f61323b5	Merge branch '2018.3' into 'fluorine' ... No conflicts.	2018-10-22 14:41:20 -04:00
Nicole Thomas	aa66d1b7ba	Merge pull request #50158 from vutny/doc/2017.7/fix-http-tutorial ... [DOC] Fix JSON payload example in HTTP tutorial	2018-10-22 14:37:51 -04:00
Denys Havrysh	fe2d70d4a3	[DOC] Fix JSON payload example in HTTP tutorial	2018-10-22 18:57:04 +03: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
Damon Atkins	aebce88d82	Merge branch '2017.7' into jenkins_pylint	2018-10-23 00:35:54 +11: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
Damon Atkins	5f708fac39	use awk to create the other files, so git does not need to search again	2018-10-21 20:06:41 +11: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
Damon Atkins	6b96a24b97	Adjust jenkins linting process, only run stage if required, use git diff to find files, instead of find, report on status, changed and deleted files, lint only changed files.	2018-10-21 01:30:54 +11: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