86942 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	2b323df453	Merge branch '2017.7' into testslogencoding	2018-09-30 14:37:40 -04:00
Nicole Thomas	98c9372de7	Merge pull request #49763 from twangboy/fix_49730 ... Add ability to clear DNS entries on static DNS	2018-09-30 14:36:40 -04:00
Mike Place	99bc8f11c1	Merge branch '2017.7' into fix_49730	2018-09-30 09:24:54 -05:00
Nicole Thomas	fd46d35a55	Merge pull request #49823 from dubb-b/timeout_addition ... Adding timeout to all pipelines so that the build aborts	2018-09-30 07:17:27 -04:00
Brett Benassi	b25ac9f773	Adding some changes for the status	2018-09-28 15:42:31 -06:00
twangboy	7a9278b825	Fix broken tests, add new tests	2018-09-28 14:59:27 -06:00
Daniel A. Wozniak	7ce1b645c0	Use utf-8 encoding for salt-runtests.log	2018-09-28 13:08:37 -07:00
Brett Benassi	f6d967931c	Updating syntax to be better and with new lines	2018-09-28 13:31:58 -06:00
Brett Benassi	855ffe60fc	Adding timeout to all pipelines so that the build aborts	2018-09-28 12:10:55 -06:00
Nicole Thomas	2cd1509fdb	Merge branch '2017.7' into fix_49730	2018-09-26 14:17:35 -04:00
Daniel Wallace	d2a193b791	Merge pull request #49792 from KaiSforza/fixscriptedpipes ... Fix the new pipelines	2018-09-26 13:15:32 -05:00
William Giokas	5b16996e20	Fix the new pipelines	2018-09-26 12:12:33 -06:00
Nicole Thomas	defba1c715	Merge branch '2017.7' into fix_49730	2018-09-26 09:25:47 -04:00
twangboy	af1ed1c4e3	Add/fix tests ... Use named parameters where possible	2018-09-25 16:48:16 -06:00
twangboy	5005a4df2f	Only clear dns entries if you pass [] ... Add test=True support when clearing	2018-09-25 15:46:27 -06:00
Daniel Wallace	8a71a43025	Merge pull request #49774 from KaiSforza/declarativeToScripted ... Move all pipelines to be fully scripted	2018-09-25 16:15:19 -05:00
Nicole Thomas	8fe8aac8f9	Merge pull request #49736 from mattLLVW/fix-file-touch ... Fix test opts in append, prepend states/file.py	2018-09-25 16:11:35 -04:00
William Giokas	cae88f2a25	Move all pipelines to be fully scripted ... This allows us to properly clean out the workspace before a job run.	2018-09-25 10:10:42 -06:00
twangboy	048561e56f	Add ability to clear DNS entries on static DNS ... Execution Module: - Passing no DNS servers will clear the list. - Update documentation - Added a note about clearing DNS entries State Module - An empty list in dns_servers will clear the entires - None in dns_servers will do nothing (default behavior) - Update Documentation	2018-09-24 15:28:54 -06:00
Nicole Thomas	f664515ac0	Merge pull request #49760 from Ch3LL/raid_docs ... Add mdadm as dependency in mdadm state docs	2018-09-24 15:42:34 -04:00
Ch3LL	0eb90c1f15	Add mdadm as dependency in mdadm state docs	2018-09-24 15:15:38 -04:00
Nicole Thomas	d5a75bf9d0	Merge pull request #49749 from erwindon/docufix ... fixed link in documentation	2018-09-24 09:30:46 -04:00
Erwin Dondorp	baee678ba5	fixed link in documentation	2018-09-22 17:00:17 +01:00
matt LLVW	1da9f340dc	Fix test opts in append, prepend states/file.py ... Fixes #49604	2018-09-21 16:53:46 +02:00
Mike Place	5ef2def2bd	Merge pull request #49703 from twangboy/fix_49675_2017.7 ... Detect when system needs reboot after domain join (2017.7)	2018-09-20 12:04:16 -04:00
Mike Place	b5726d27be	Merge pull request #49718 from vutny/doc/2017.7/add-missing-mock-kwarg ... [DOC] Add missing `mock` argument for `state.apply`	2018-09-20 09:22:06 -04:00
Denys Havrysh	3e19176664	[DOC] Add missing mock argument for state.apply	2018-09-20 12:06:37 +03:00
Mike Place	912722253c	Merge branch '2017.7' into fix_49675_2017.7	2018-09-19 16:12:45 -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
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
twangboy	4f544225a3	Fix reboot needed detection ... Fix the following: - get_pending_update - get_pending_domain_join - get_pending_component_servicing	2018-09-18 13:35:32 -06: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	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
Erik Johnson	7e5bab78c5	Fix docs build errors (2017.7 branch)	2018-09-17 22:35:08 -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	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	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
Nicole Thomas	7a75d5e9f4	Merge pull request #49597 from rallytime/bp-47232 ... Back-port #47232 to 2017.7	2018-09-12 10:25:15 -04:00
Nicole Thomas	2f6cdd9fd5	Merge pull request #49614 from rallytime/bp-49546 ... Back-port #49546 to 2017.7	2018-09-11 16:55:40 -04:00
rallytime	0f3881ab4f	Skip flaky test on Python 3 ... Even with the flaky decorator, this test sometimes passes and sometimes fails. Let's skip it for now.	2018-09-11 14:15:52 -04:00
Nicole Thomas	aa560c5a8b	Merge pull request #49595 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.8 to 2017.7	2018-09-11 10:03:20 -04:00
Nicole Thomas	e8171de57b	Merge pull request #49596 from terminalmage/kill-bare-excepts-with-fire ... Kill bare excepts with fire	2018-09-11 09:58:16 -04:00
Jochen Breuer	c477b70753	Fixed usage of ipaddress ... ipaddress is imported either directly or from salt.ext. If we use it, we shouldn't address it with salt.ext.ipaddress.	2018-09-10 16:09:49 -04:00
Erik Johnson	729dc0819f	Kill bare excepts with fire ... These prevent the signal handlers from shutting down a process via a raising a SystemExit. They are ticking time bombs of race conditions that leave processes running when daemons are shut down or restarted. Friends don't let friends use bare excepts.	2018-09-10 13:19:03 -06:00
rallytime	09247a33a2	Merge branch '2017.7.8' into '2017.7' ... No conflicts.	2018-09-10 12:53:13 -04:00