85903 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Wallace	550ef2e272	allow using tornado 5.0	2018-05-17 08:41:32 -05:00
Daniel Wallace	62e468448b	handle new _create_stream in tornado 5.0 ... In tornado 5.0, this _create_stream function now returns a tuple instead of just the stream.connect() object. So since we are overriding it, we need to update. Also initialize the SaltMessageServer with the current io_loop set.	2018-05-17 08:41:32 -05:00
Nicole Thomas	16c2153385	Merge pull request #47667 from Ch3LL/mac_user_enable ... Update test_mac_user_enable_auto_login to test both py2 and py3	2018-05-16 11:54:48 -04:00
Ch3LL	ba40d3d1a1	Update test_mac_user_enable_auto_login to test both py2 and py3	2018-05-15 14:40:54 -04:00
Nicole Thomas	a4921e86c9	Merge pull request #47645 from Ch3LL/py3_rm_pip ... query the pip path for test test_issue_2087_missing_pip	2018-05-15 13:16:10 -04:00
Nicole Thomas	e441733ac1	Merge pull request #47646 from rallytime/bp-47601-and-47643 ... Back-port #47601 and #47643 to 2017.7.6	2018-05-15 10:04:44 -04:00
Daniel A. Wozniak	9e1d1a5ef8	Fix typo	2018-05-14 15:49:36 -04:00
Daniel A. Wozniak	4e94609136	Remove unwanted file	2018-05-14 15:49:31 -04:00
Daniel A. Wozniak	0109249c78	use ignore-undefined-variable	2018-05-14 15:49:20 -04:00
Daniel A. Wozniak	37caecb7f4	Ignore pylint WindowsError	2018-05-14 15:49:15 -04:00
Daniel A. Wozniak	c1135d90c7	Better doc string	2018-05-14 15:49:08 -04:00
Daniel A. Wozniak	e53d6b9ed9	Skip tests when we can not use runas	2018-05-14 15:49:02 -04:00
Ch3LL	225d90ad4c	query the pip path for test test_issue_2087_missing_pip	2018-05-14 15:45:37 -04:00
Mike Place	6f178ca908	Merge pull request #47570 from gtmanfred/2017.7.6 ... Update dependency to msgpack	2018-05-10 08:23:08 -05:00
Daniel Wallace	84aa034e03	Update dependency to msgpack	2018-05-09 12:47:07 -05:00
Nicole Thomas	98bd598701	Merge pull request #47523 from rallytime/man-pages ... [2017.7.6] Update man pages	2018-05-08 09:31:18 -04:00
rallytime	48ecb78dec	[2017.7.6] Update man pages	2018-05-07 20:31:38 +00:00
Nicole Thomas	e608ea9617	Merge pull request #47517 from rallytime/bp-47505-2017.7.6 ... Back-port #47505 to 2017.7.6	2018-05-07 15:42:37 -04:00
Daniel A. Wozniak	0734578533	Raise proper invocation errors	2018-05-07 13:59:17 -04:00
Daniel Wallace	611ca1fc03	Merge pull request #47476 from gtmanfred/2017.7 ... Specify the cache directory for newer virtualenv modules	2018-05-04 14:20:44 -05:00
Daniel Wallace	1f91a85587	specify cache dir for pip install	2018-05-04 12:48:52 -05:00
Nicole Thomas	7c3f2c56da	Merge pull request #47412 from twangboy/fix_47125 ... Fix issue where the cwd was being removed	2018-05-04 13:28:10 -04:00
Nicole Thomas	4846e957c4	Merge pull request #47467 from twangboy/cleanup_settings ... Remove unused settings, update NSIS	2018-05-04 13:11:37 -04:00
Daniel Wallace	99e150e09c	check for kitchen-vagrant gem before loading windows tests	2018-05-04 09:45:53 -05:00
Nicole Thomas	da9871d36b	Merge pull request #47196 from twangboy/fix_47024 ... Fix issues with pip	2018-05-04 10:23:03 -04:00
Mike Place	c9bab0b8e3	Merge branch '2017.7' into fix_47125	2018-05-04 09:14:06 -05:00
Nicole Thomas	e8c4524bae	Merge pull request #47455 from Ch3LL/unreleased_rn ... Add In Progress Warning for 2017.7.6 Release Notes	2018-05-04 09:44:54 -04:00
twangboy	9d498293b1	Remove unused settings, update NSIS	2018-05-03 16:46:03 -06:00
Nicole Thomas	2c7a4b6179	Merge pull request #47459 from gtmanfred/2017.7 ... update ubuntu-rolling to 18.04	2018-05-03 16:39:19 -04:00
Nicole Thomas	64a64c0ed7	Merge pull request #47462 from terminalmage/docs ... Fix docs build on Sphinx 1.7+	2018-05-03 16:06:56 -04:00
Erik Johnson	6d7803ece0	Fix docs build on Sphinx 1.7+ ... Sphinx 1.7 got rid of sphinx.utils.compat. This commit allows the builds to work both on both older and newer Sphinx.	2018-05-03 13:31:34 -05:00
Daniel Wallace	d228e72477	update ubuntu-rolling to 18.04	2018-05-03 12:02:22 -05:00
Ch3LL	b6d0cc2ab7	Add In Progress Warning for 2017.7.6 Release Notes	2018-05-03 12:06:15 -04:00
Nicole Thomas	6cd0d31c03	Merge pull request #47438 from lomeroe/double_admx_test ... lgpo fix for issue #47436	2018-05-03 10:40:26 -04:00
Nicole Thomas	ed69821d19	Merge pull request #47433 from s0undt3ch/2017.7 ... Add missing requirements files not commited in #47106	2018-05-02 16:57:13 -04:00
twangboy	14ee5537b9	Add @with_tempdir helper ... Fix two state tests Remove redundent tests	2018-05-02 12:17:36 -06:00
Pedro Algarvio	5abadf25d6	Add missing requirements files not commited in #47106	2018-05-02 18:34:09 +01:00
lomeroe	4902f1e2ba	check if a policy has either an enabled value or enabled list entry or ... a disabled value or disabled list entry when determining the state of the policy Some policies have one but not the other (in which case different entries in the registry.pol file are added for 'Enabled' or 'Disabled'). A partial fix for this was previously added, but did not check for all possible types when trying to determine if the policy is enabled/disabled and also did not perform the same check in the enabled/disabled list checks. This would result in some policies being reported by the module as Enabled even though they were disabled (for example "Windows Components\Internet Explorer\Make proxy settings per-machine (rather than per-user)" if set to 'Disabled' would report 'Enabled')	2018-05-02 11:43:51 -05:00
Nicole Thomas	7ae3497b0c	Merge pull request #47429 from gtmanfred/2017.7 ... server_list_min should use state, not status	2018-05-02 12:27:55 -04:00
Mike Place	2f5fc4ecc5	Merge pull request #47399 from isbm/isbm-zeromq17-deprecationwarning-2017.7.2-v2 ... zeromq 17 deprecation warning backport from 2018.3 + tornado 5 fixes	2018-05-02 10:11:15 -05:00
Daniel Wallace	8ae32033cc	server_list_min should use state, not status ... This is what is used when getting server names quickly.	2018-05-02 08:45:55 -05:00
Nicole Thomas	b14e974b5f	Merge pull request #47343 from Ch3LL/win_srv_test ... Add additional service module integration tests and enable for windows	2018-05-02 09:39:45 -04:00
twangboy	6c3b5fa6fa	Fix typo	2018-05-01 16:28:48 -06:00
Shane Lee	f031710af2	Merge branch '2017.7' into fix_47024	2018-05-01 16:26:04 -06:00
twangboy	7c46d9d0d4	Fix integration.modules.test_pip ... Pass password as kwarg for runas on Windows Fix issues with pip 10 in unit.states.test_pip	2018-05-01 15:33:29 -06:00
Nicole Thomas	b0f3fb577f	Merge pull request #47375 from terminalmage/issue47310 ... Warn on use of virtual packages in pkg.installed state	2018-05-01 17:12:18 -04:00
Nicole Thomas	56235032f4	Merge pull request #47415 from kstreee/fix-local-client-tgt-bug ... Fixes a bug of rest_tornado's 'local' client, complement fix of #46326	2018-05-01 17:11:24 -04:00
Nicole Thomas	d65ceaee03	Merge pull request #47286 from baniobloom/vpc_peering_connection_name_fix ... fixed vpc_peering_connection_name option	2018-05-01 15:02:09 -04:00
kstreee@gmail.com	b8d37e0a1e	To add a test case for the syndic environment, copies the test case which was written by @mattp- that was already merged into develop branch, related pr is #46692.	2018-05-02 03:21:06 +09:00
Erik Johnson	fa2bea52bb	Remove extra blank line to appease linter	2018-05-01 13:11:19 -05:00