94635 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	0a530d2f8f	Merge pull request #49731 from terminalmage/jinja-filter-warning ... Add warning about using jinja filters to dump dicts in Jinja	2018-09-21 09:16:04 -04:00
Erik Johnson	8393560642	Add warning about using jinja filters to dump dicts in Jinja	2018-09-20 14:56:26 -05:00
Nicole Thomas	91acb82537	Merge pull request #49696 from jgleissner/2018.3-azurearm-deps ... loosen azure sdk dependencies in azurearm cloud driver	2018-09-20 15:17:14 -04:00
Nicole Thomas	d434e3664b	Merge pull request #49684 from twangboy/fix_49675 ... Detect when system needs reboot after domain join	2018-09-20 12:17:49 -04:00
Nicole Thomas	936cae5017	Merge pull request #49710 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-09-19 14:05:49 -04:00
Joachim Gleissner	467e017cdb	remove unused import from azurearm driver	2018-09-19 17:27:11 +02:00
rallytime	d19c67f619	Merge branch '2017.7' into '2018.3' ... No conflicts.	2018-09-19 09:59:32 -04:00
Nicole Thomas	b082f79fcb	Merge pull request #49708 from rallytime/bp-49555 ... Back-port #49555 to 2018.3	2018-09-19 09:12:11 -04:00
Nicole Thomas	0e97d9e694	Merge pull request #49707 from rallytime/bp-49702 ... Back-port #49702 to 2018.3	2018-09-19 09:09:09 -04:00
Gareth J. Greenaway	6bd85b5946	Merge pull request #49706 from garethgreenaway/1120_remove_mock_os_path_join ... [2017.7] Removing os.path.join mocking from tests.	2018-09-18 21:09:09 -06:00
Florian Bergmann	ed25416542	Change StringIO import in python2 to import the class. ... Instead of using StringIO in python3, use the correct BytesIO class instead.	2018-09-18 20:04:31 -04:00
rallytime	7ff24e5fb8	Mark orchestration test as expensive	2018-09-18 20:02:50 -04:00
Gareth J. Greenaway	f4ccc75587	Removing mocking of os.path.join from two tests, one of which was failing when used with coverage argument. No reason we should be mocking os.path.join.	2018-09-18 16:58:48 -06:00
Nicole Thomas	c38dc61413	Merge pull request #49692 from rallytime/bp-49688 ... Back-port #49688 to 2017.7	2018-09-18 16:09:28 -04:00
Nicole Thomas	0c4005d45f	Merge pull request #49693 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-09-18 16:05:27 -04:00
twangboy	3600467a04	Fix some try/except blocks, mark a lazy test	2018-09-18 10:56:51 -06:00
twangboy	871c11a7c1	Fix other functions in the same manner ... - get_pending_update - get_pending_component_servicing	2018-09-18 10:56:50 -06:00
Daniel Wozniak	1b5bc669c4	Merge branch '2018.3' into fix_49675	2018-09-18 10:00:43 -06:00
rallytime	b39dacf06c	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/pillar/cmd_yamlex.py	2018-09-18 10:08:16 -04:00
William Giokas	fde757517f	Order the runtests suites ... Uses an ordered dictionary instead of a default python dict when describing the `TEST_SUITES` variable. Sorts alphabetically based on the name of the suite.	2018-09-18 10:04:02 -04:00
Nicole Thomas	37cbd274e5	Merge pull request #49685 from rallytime/pillar-headings ... Fix heading line-lengths	2018-09-18 10:02:56 -04:00
Nicole Thomas	a12176db40	Merge pull request #49674 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2018.3.3 to 2018.3	2018-09-18 09:36:59 -04:00
Nicole Thomas	9bad295fad	Merge pull request #49689 from terminalmage/2017.7-docs ... Fix docs build errors (2017.7 branch)	2018-09-18 09:36:27 -04:00
rallytime	02b2d544c0	Split intro docs for cmd_yamlex pillar into shorter lines.	2018-09-18 09:34:00 -04:00
Joachim Gleissner	bad28b65cd	loosen azure sdk dependencies in azurearm cloud driver ... Remove dependency to azure-cli, which is not used at all. Use azure-storage-sdk as fallback if multiapi version is not available.	2018-09-18 15:07:13 +02:00
Erik Johnson	7e5bab78c5	Fix docs build errors (2017.7 branch)	2018-09-17 22:35:08 -06:00
twangboy	95e6f542cf	Detect when system needs reboot after domain join ... Adds value_exists function Uses key_exists instead of reading and failing	2018-09-17 14:57:57 -06:00
rallytime	c4cbe5b90e	Fix heading line-lengths ... This will clean up some of the warnings found by building the documentation: ``` /root/SaltStack/salt/doc/ref/pillar/all/index.rst:55:<autosummary>:1: WARNING: Unexpected section title or transition. ================= ```	2018-09-17 16:36:16 -04:00
Nicole Thomas	7bcb80981e	Merge pull request #31 from dwoz/merge-2018.3 ... Account for filename changes	2018-09-17 13:37:15 -04:00
Daniel A. Wozniak	cb35ebb1ac	Account for filename changes	2018-09-17 11:27:05 -06:00
rallytime	f3b122f4e3	Merge branch '2018.3.3' into '2018.3' ... Conflicts: - tests/whitelist.txt	2018-09-17 12:04:44 -04:00
Nicole Thomas	e636dacc35	Merge pull request #49593 from dwoz/add_whitelist ... Add more tests to whitelist for Windows	2018-09-17 10:57:43 -04:00
Nicole Thomas	7823839bc2	Merge pull request #49639 from isbm/isbm-yumnotify-md5 ... Retire MD5 checksum for pkg mgmt plugins	2018-09-17 10:51:53 -04:00
Daniel Wozniak	2e1bf1335a	Merge branch '2018.3' into add_whitelist	2018-09-16 10:49:21 -06:00
Daniel A Wozniak	2340a5875f	Fix runner returns test on Windows	2018-09-15 15:14:40 -06:00
Mike Place	9d8cc0b3f4	Merge pull request #49662 from dwoz/2018.3.3 ... Fix another bad filename reference in whitelist	2018-09-14 16:20:48 -06:00
Daniel A. Wozniak	e109023013	Fix another bad filename reference in whitelist	2018-09-14 15:36:30 -06:00
Nicole Thomas	aecbe12c8f	Merge pull request #49652 from rallytime/merge-2018.3 ... [2018.3] Merge forwrad from 2018.3.3 to 2018.3	2018-09-14 17:20:39 -04:00
Nicole Thomas	6391560d57	Merge pull request #49655 from dwoz/2018.3.3 ... Fix windows test whitelist errors	2018-09-14 16:34:55 -04:00
Daniel A. Wozniak	8a4946478e	Fix windows test whitelist errors	2018-09-14 10:42:04 -06:00
rallytime	a8a38205e7	Merge branch '2018.3.3' into '2018.3' ... Conflicts: - tests/unit/utils/test_stringutils.py	2018-09-14 09:33:33 -04:00
Nicole Thomas	530e28142c	Merge pull request #49646 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-09-14 09:30:21 -04:00
rallytime	186f57eede	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/network.py	2018-09-13 17:11:18 -04:00
Nicole Thomas	3c8ec8a22f	Merge pull request #49644 from rallytime/mark-flaky-test ... Mark grains test as flaky	2018-09-13 14:25:05 -04:00
Nicole Thomas	bb1dcdf3cb	Merge pull request #49642 from rallytime/flaky-tests ... Skip some unreliable tests	2018-09-13 14:24:42 -04:00
Nicole Thomas	3fb3ffdb37	Merge pull request #49641 from rallytime/bp-49632 ... Back-port #49632 to 2018.3.3	2018-09-13 12:46:01 -04:00
Nicole Thomas	8ac66f1965	Merge pull request #49643 from rallytime/bp-49642 ... Back-port #49642 to 2017.7	2018-09-13 12:45:38 -04:00
rallytime	be8a187b4d	Mark grains test as flaky	2018-09-13 16:17:02 +00:00
rallytime	accef8c7dd	Skip some unreliable tests ... We need to investigate these more in the future, but let's skip them for now so we can see some better signaling.	2018-09-13 10:33:59 -04:00
rallytime	8e74d1c9e4	Skip some unreliable tests ... We need to investigate these more in the future, but let's skip them for now so we can see some better signaling.	2018-09-13 10:31:08 -04:00