85810 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel A. Wozniak	9f7f83a975	Use salt.utils.fopen for line ending consistancy	2018-04-26 12:43:51 -07:00
Daniel A. Wozniak	dcb6a22c00	Remove un-needed string-escape	2018-04-26 11:28:25 -07:00
Erik Johnson	65c3ba7ff1	Remove useless documentation ... The private funcs aren't parsed by RST autosummary so telling someone to view them is not helpful	2018-04-26 12:01:22 -05:00
Erik Johnson	5d67cb27de	Remove unncessary commented line	2018-04-26 12:00:40 -05:00
Daniel A. Wozniak	cc154ef857	Do not encode usernames	2018-04-26 09:53:56 -07:00
Mike Place	708078b152	Merge pull request #47329 from cachedout/frank_credit ... Credit Frank Spierings	2018-04-26 11:37:58 -05:00
Mike Place	33c0644ac4	Credit Frank Spierings	2018-04-26 11:29:51 -05:00
Nicole Thomas	a545e55543	Merge pull request #47281 from Ch3LL/system_test ... Add win_system integration module tests	2018-04-26 12:07:40 -04:00
Nicole Thomas	b64d930df0	Merge pull request #47283 from Ch3LL/ntp_test ... Add windows ntp integration module tests	2018-04-26 12:04:43 -04:00
Nicole Thomas	910aff910f	Merge pull request #47314 from Ch3LL/net_mac_test ... Skip netstat test on macosx as its not supported	2018-04-26 12:00:36 -04:00
Nicole Thomas	0549ef7c16	Merge pull request #47307 from rallytime/bp-47257 ... Back-port #47257 to 2017.7	2018-04-26 11:16:22 -04:00
Nicole Thomas	d6ff4689f6	Merge pull request #47312 from rallytime/update-bootstrap-release ... Update bootstrap script to latest release: 2018.04.25	2018-04-26 11:15:12 -04:00
Daniel A. Wozniak	d4ae787595	Do not join a thread that is stopped ... Remove the need for exception handling by not raising exceptions in the first place.	2018-04-25 14:26:25 -07:00
Mike Place	e0765f5719	Merge pull request #47279 from dwoz/py3_build_fix ... Gracefully shutdown worker threads	2018-04-25 16:15:42 -05:00
Ch3LL	67beb1451c	Skip netstat test on macosx as its not supported	2018-04-25 16:44:28 -04:00
rallytime	765cce06a2	Update bootstrap script to latest release: 2018.04.25	2018-04-25 15:44:50 -04:00
Ch3LL	4e16c18c16	Add firewall module windows tests to whitelist	2018-04-25 15:26:45 -04:00
Ch3LL	4b2fc4ec66	Add windows firewall execution modules integration tests	2018-04-25 15:25:55 -04:00
Jeroen Nijhof	6c5b2f92bc	Role is not a list but a dictionary	2018-04-25 14:06:28 -04:00
Nicole Thomas	44f19b2f94	Merge pull request #47113 from jfindlay/iptables_state ... Support proto for IPSec policy extension in iptables state	2018-04-25 14:01:18 -04:00
Nicole Thomas	b7a6206330	Merge pull request #47302 from Ch3LL/dead_code ... Remove unnecessary code from core grains and add test	2018-04-25 13:58:47 -04:00
Nicole Thomas	e29362acfc	Merge pull request #47303 from baniobloom/bug_fix_doc ... Added clarity on oldest supported main release branch	2018-04-25 13:52:38 -04:00
Daniel A. Wozniak	21dc1bab91	Pep-8 line endings	2018-04-25 09:20:26 -07:00
Mike Place	85025af83c	Pass timeout to salt CLI for tests ... This should hopefully fix up the race condition in the long-running jobs test.	2018-04-25 11:04:59 -05:00
Banio Carpenter	b97c9df5f3	added clarity on how to figure out what is the oldest supported main release branch	2018-04-25 10:59:22 -05:00
Nicole Thomas	0d9d55e013	Merge pull request #47106 from DSRCorporation/bugs/tornado50 ... Tornado50 compatibility fixes	2018-04-25 11:32:36 -04:00
Daniel A. Wozniak	717abedaf7	Fix comman wart	2018-04-25 08:31:07 -07:00
Ch3LL	daa68b4877	Add virtual grains test for core grains	2018-04-25 11:03:35 -04:00
Nicole Thomas	2e014f4746	Merge pull request #47271 from gtmanfred/amazon ... load rh_service for amazon linux not booted with systemd	2018-04-25 10:47:05 -04:00
Nicole Thomas	599b0ed1e9	Merge pull request #47246 from cloudflare/fix-44847-2017.7 ... Attempting to fix #44847: allow a different way to get the test and debug flags into the netconfig state	2018-04-25 10:44:01 -04:00
Nicole Thomas	4e2e1f0719	Merge pull request #47220 from benediktwerner/fix-pip-2017.7 ... Fix pip.installed when no changes occurred with pip >= 1.0.0	2018-04-25 10:23:49 -04:00
Ch3LL	a59dd2785d	Remove dead code in core grains file for virt-what	2018-04-25 10:22:56 -04:00
Nicole Thomas	92e606251f	Merge pull request #47272 from rallytime/reg-windows-codeowners ... Add windows tests and reg module/state to CODEOWNERS file for team-windows	2018-04-25 09:25:28 -04:00
Daniel A Wozniak	4100dcd64c	Close might get called more than once ... Since close can be called more than once handle and log exceptions	2018-04-24 23:52:13 -07:00
Daniel A Wozniak	dbe671f943	Stop socket before queue on delete	2018-04-24 19:24:03 -07:00
Daniel A. Wozniak	9587f5c69e	Silence pylint import-error for six.moves	2018-04-24 17:21:30 -07:00
Daniel A. Wozniak	4b0c7d3b34	Fix typo	2018-04-24 16:17:14 -07:00
Daniel A. Wozniak	05adf7c2b1	Use six.moves for queue import	2018-04-24 15:18:36 -07:00
Ch3LL	ced7f86546	Add windows ntp integration module tests	2018-04-24 15:12:58 -04:00
Ch3LL	c9181a75a6	Add destructivetest decorator on tests	2018-04-24 14:44:15 -04:00
Ch3LL	0d0c8987fc	Add win_system integration module tests	2018-04-24 14:37:14 -04:00
Daniel A Wozniak	fe340778fa	Gracefully shutdown worker threads	2018-04-24 10:21:43 -07:00
rallytime	9445af0185	Add windows tests and reg module/state to CODEOWNERS file for team-windows ... `team-windows` should be requested for reviews whenever a windows test file or the reg.py execution module and accompanying reg.py state file are edited.	2018-04-24 10:32:51 -04:00
Nicole Thomas	9dca5c0221	Merge pull request #47252 from rallytime/codeowners-fixes ... Fix the matching patterns in the CODEOWNERS file to use fnmatch patterns	2018-04-24 10:10:41 -04:00
Daniel Wallace	8a53908908	Do not load rh_service module when booted with systemd ... Amazon continues to release versions of Amazon Linux 1, which boots with rh_service, but also Amazon linux 2, and both with the same versioning scheme, so we cannot depend on the date for making decisions here.	2018-04-24 09:09:03 -05:00
Daniel Wallace	e4d1d5bf11	Revert "support amazon linux 2 for service module" ... This reverts commit 37e067c7b5.	2018-04-24 09:08:51 -05:00
Nicole Thomas	3de1bb49c8	Merge pull request #47177 from fpicot/fix_47173_pkg_normalize ... fix normalize parameter in pkg.installed	2018-04-24 09:37:53 -04:00
rallytime	204b6af92b	Fix the matching patterns in the CODEOWNERS file to use fnmatch patterns ... The CODEOWNERS file documentation for GitHub says they use a .gitignore-style file matching pattern. However, since [tamarack](https://github.com/rallytime/tamarack) is doing the actual team review requesting work, it uses Python's fnmatch lib. This PR updates some of the file matching patterns to use fnmatch more specifically and will improve the review requests to be more accurate and increase the number of automatic team review requests.	2018-04-23 15:40:08 -04:00
Nicole Thomas	10e30515dc	Merge pull request #47251 from Ch3LL/pub_fix_rn ... Update Docs to remove unnecessary + sign	2018-04-23 15:37:03 -04:00
Ch3LL	fa4c2e6575	Update Docs to remove unnecessary + sign	2018-04-23 15:35:04 -04:00