92672 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
rallytime	120ee16b70	Replace old utils paths with new utils paths	2018-05-29 11:19:34 -04:00
rallytime	dc32b67c03	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/win_snmp.py - tests/integration/modules/test_saltutil.py - tests/integration/states/test_pkg.py - tests/support/helpers.py - tests/support/runtests.py - tests/unit/fileserver/test_gitfs.py - tests/whitelist.txt	2018-05-29 11:14:39 -04:00
Nicole Thomas	61561a8279	Merge pull request #47221 from azelezni/fix-boto_ec2-network_interfaces ... Fix boto_ec2 unused parameter "network_interfaces"	2018-05-29 10:41:34 -04:00
Daniel Wallace	4b28e510f1	Merge pull request #47853 from dwoz/py3-cloud-test ... Fix for py3 ec2 cloud tests	2018-05-28 18:08:08 -05:00
Daniel A. Wozniak	c2f8aef7c5	Fix for py3 ec2 cloud tests	2018-05-27 14:09:50 -07:00
Daniel Wallace	c4d828c986	Merge pull request #47850 from rallytime/swarm-autodoc ... Fix autodoc for new swarm module	2018-05-25 20:53:16 -05:00
Nicole Thomas	30b31c5db5	Merge pull request #47800 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-05-25 21:17:40 -04:00
rallytime	467c8fa45c	Fix autodoc for new swarm module ... A misspelling of "members" was causing the docs for the swarm module to not build. This change also fixes a bunch of formatting for RST, a handful of other misspellings, and some small code clean-up. The docs should be building for the swarm execution module with the appropriate doc and CLI example formatting.	2018-05-25 21:07:51 -04:00
Daniel Wallace	215efa6b73	Merge pull request #47847 from garethgreenaway/47833_reactor_runner_documentation ... [2017.7] reactor runner documentation	2018-05-25 18:23:31 -05:00
Nicole Thomas	0bf651b470	Merge pull request #47846 from Ch3LL/p_refresh_test ... Fix flaky refresh pillar integration test	2018-05-25 16:50:48 -04:00
Nicole Thomas	799fce979d	Merge pull request #47552 from twangboy/fix_46981 ... Show GPO settings, raise error if trying to set gpo managed settings	2018-05-25 16:41:21 -04:00
Nicole Thomas	da9eaa1825	Merge pull request #47581 from twangboy/fix_47274 ... Add get_encoding salt util	2018-05-25 16:40:06 -04:00
Nicole Thomas	ffc2ebc373	Merge pull request #47691 from lomeroe/solaris_product_grains ... Update regexes for Solaris 'product' grain and copy to 'productname' grain	2018-05-25 16:38:18 -04:00
Nicole Thomas	b860d95b2c	Merge pull request #47726 from gtmanfred/2018.3 ... rename boto to botomod	2018-05-25 16:37:36 -04:00
Nicole Thomas	96b7c0cc76	Merge pull request #47778 from Ch3LL/win_state_pkg ... Add test_pkg integration state tests to windows	2018-05-25 16:36:46 -04:00
Nicole Thomas	6f934c2259	Merge pull request #47823 from Ch3LL/win_dns_test ... Add win_dns module integration tests for windows	2018-05-25 16:34:02 -04:00
Nicole Thomas	e63e04602d	Merge pull request #47838 from rallytime/bp-47810 ... Back-port #47810 to 2017.7	2018-05-25 16:33:43 -04:00
rallytime	9e3ce39e8c	Typo: test_type --> text_type	2018-05-25 16:10:52 -04:00
Gareth J. Greenaway	03676712de	Adding some addition documentation to the reactor runner indicating that the reactor system must be active prior to using it.	2018-05-25 13:01:36 -07:00
Ch3LL	019edad8e4	Fix flaky refresh pillar integration test	2018-05-25 15:13:56 -04:00
rallytime	8877489386	Fix bad merge caught by test in zpool state ... Also fix up some of the comment formatting	2018-05-25 10:47:33 -04:00
Nicole Thomas	6889befc6b	Merge branch '2017.7' into solaris_product_grains	2018-05-25 09:57:40 -04:00
Nicole Thomas	9ef6e60617	Merge pull request #47805 from twangboy/add_sign.bat ... Add sign.bat script for signing packages	2018-05-25 09:53:58 -04:00
rmcintosh	bd2b62fa66	better debug message ... also, give Cloud Profile its proper capitalization and some minor formatting consistency updates	2018-05-25 09:33:46 -04:00
rmcintosh	83565c55df	Address PR feedback	2018-05-25 09:33:39 -04:00
rmcintosh	50bce3a2f3	make decode_linode_plan_label a private function	2018-05-25 09:33:33 -04:00
rmcintosh	2ba4fc4cea	fix raising when a 'GB' format invalid plan is supplied	2018-05-25 09:33:24 -04:00
rmcintosh	3afb50d5a2	slight cleanup	2018-05-25 09:33:17 -04:00
rmcintosh	319fbd3406	match quotation mark types properly	2018-05-25 09:33:11 -04:00
rmcintosh	95e0202223	more consistent use of parens in logged warning	2018-05-25 09:33:04 -04:00
rmcintosh	f52926ca87	log a warning when the user supplied a label we could decode but was not in the proper format	2018-05-25 09:32:57 -04:00
rmcintosh	121303d827	reduce complexity of get_plan_id by moving decoding of the user-supplied label to its own function	2018-05-25 09:32:52 -04:00
rmcintosh	cf534c7314	Fix Linode plan selection	2018-05-25 09:32:46 -04:00
Daniel Wozniak	93420950d3	Merge pull request #47500 from dwoz/winuser ... Get the current username on windows	2018-05-24 12:14:06 -07:00
Ch3LL	7848114d6a	Add win_dns module integration tests for windows	2018-05-24 14:11:27 -04:00
Nicole Thomas	e1786de6b0	Merge branch '2017.7' into win_state_pkg	2018-05-24 13:36:53 -04:00
Nicole Thomas	cffc9b7806	Merge branch '2017.7' into fix_46981	2018-05-24 12:52:59 -04:00
Nicole Thomas	ff6600f25e	Merge branch '2018.3' into fix_47274	2018-05-24 12:47:29 -04:00
Nicole Thomas	552526f309	Merge pull request #47802 from rallytime/bp-40892 ... Back-port #40892 to 2017.7	2018-05-24 12:34:35 -04:00
Nicole Thomas	0ca5224cbf	Merge branch '2017.7' into winuser	2018-05-24 12:08:35 -04:00
Daniel Wallace	c9cccf53b9	Merge pull request #47816 from Ch3LL/disable_windows ... Add windows to service disable ERROR check in tests	2018-05-24 10:31:35 -05:00
Ch3LL	2509d36888	Add windows to service disable ERROR check in tests	2018-05-24 08:30:17 -04:00
Daniel A. Wozniak	e5948902af	Use salt utils method for this_user	2018-05-24 00:40:20 -07:00
Daniel A. Wozniak	a056a293f1	Centeralize test username lookup	2018-05-23 16:16:35 -07:00
Daniel A Wozniak	6a6ab69722	Get the current username on windows	2018-05-23 16:16:32 -07:00
Nicole Thomas	2a270162d0	Merge pull request #47803 from rallytime/bp-47703 ... Back-port #47703 to 2018.3	2018-05-23 16:12:30 -04:00
Nicole Thomas	780043e6fd	Merge pull request #47804 from rallytime/bp-47761 ... Back-port #47761 to 2018.3	2018-05-23 16:11:54 -04:00
twangboy	81308a4a44	Add release notes for 2017.7.7	2018-05-23 13:47:08 -06:00
Nicole Thomas	2cb6634c6b	Merge pull request #47773 from frogunder/45011 ... add win_servermanager.list_available test	2018-05-23 15:44:13 -04:00
Nicole Thomas	e65dece202	Merge pull request #47807 from dwoz/winrmtests ... Try an even bigger timeout	2018-05-23 15:38:20 -04:00