86137 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	998a1c13d5	Merge pull request #47966 from mbunkus/fix-postfix-prefix-free-key-names-assumption ... Fix postfix.set_main's assumption of prefix-free key names	2018-06-06 11:43:23 -04:00
Nicole Thomas	df50ce7b1b	Merge pull request #47824 from twangboy/fix_setup.py ... Fix issues with setup.py in Windows	2018-06-05 13:39:52 -04:00
Nicole Thomas	3e91a31134	Merge pull request #47922 from damon-atkins/2017.7_win_pkg_keys_fix ... win_pkg: pkg.refresh_db verbose=True PY3 compatibility fix	2018-06-05 09:31:48 -04:00
Moritz Bunkus	0ae402d1b5	Fix postfix.set_main's assumption of prefix-free key names ... Salt's "postfix.set_main" module function used "line.startswith()" for determining which entries from "main.cf" to keep and which to overwrite. This matched more lines that intended, though, as the names of Postfix' configuration options aren't prefix-free. For example, both "virtual_transport" and "virtual_transport_rate_delay" are valid and known keys. Therefore trying to set "virtual_transport" would lead to "virtual_transport_rate_delay" being replaced, too, by another instance of "virtual_transport". The new method matches the line based on the key name being terminated by whitespace, an equal sign or the end of the line. Fixes #47888.	2018-06-05 15:05:51 +02:00
Damon Atkins	7129203b1b	Merge branch '2017.7' into 2017.7_win_pkg_keys_fix	2018-06-05 00:45:52 +10:00
Nicole Thomas	8008fca2f6	Merge pull request #47933 from terminalmage/add-pillar.get-docs ... Clarify pillar.get docs	2018-06-04 10:07:57 -04:00
Nicole Thomas	ab565bfaa3	Merge pull request #47944 from terminalmage/fix-git.detached-docs ... Replace use of deprecated argument name in git.detached docstring	2018-06-04 09:53:33 -04:00
Erik Johnson	1d082b4389	Replace use of deprecated argument name in git.detached docstring	2018-06-03 00:19:11 -05:00
Damon Atkins	6253793cb6	Merge branch '2017.7' into 2017.7_win_pkg_keys_fix	2018-06-03 11:23:16 +10:00
Erik Johnson	4eb022b675	Clarify pillar.get docs ... Explicitly state that pillar.get pulls from in-memory pillar data.	2018-06-01 17:06:02 -05:00
twangboy	4538b3abb3	Remove 'len-as-condition' disablement	2018-06-01 11:51:52 -06:00
twangboy	d4efcc3c8b	Skip lint errors	2018-06-01 11:51:08 -06:00
twangboy	1b3977f8d4	Remove m2crypto download for Windows ... Fix pip issue with pip 10	2018-06-01 11:50:59 -06:00
Nicole Thomas	a2b588299b	Merge pull request #47860 from terminalmage/state-writing-docs ... Clean up doc build warnings, add best practices for writing states	2018-06-01 10:42:54 -04:00
Damon Atkins	4ce0fe6546	win_pkg under py3 keys returns a view instead of a list, wrap keys in list()	2018-06-02 00:12:20 +10:00
Daniel Wallace	d2f3377b5b	Merge pull request #47877 from dwoz/sleep_audit ... Revert job chunk wait time change	2018-06-01 09:11:45 -05:00
Daniel Wallace	735e92093e	Merge pull request #47917 from dwoz/winsuite ... Fix windows tests suite breakage	2018-06-01 06:42:14 -05:00
Daniel A Wozniak	118601ebd6	Fix windows tests suite breakage	2018-05-31 23:17:18 -07:00
Erik Johnson	8cb33d3dec	Quiet the linter ... We need this import to determine whether we have the needed modules to run the test, even though it is not invoked directly.	2018-05-31 15:28:25 -05:00
Erik Johnson	af51e16f23	Use more elegant RST syntax	2018-05-31 15:28:25 -05:00
Erik Johnson	91cd57d1e0	Update mocking to reflect changes in service module	2018-05-31 15:28:25 -05:00
Erik Johnson	b9ace5a859	Fix crappy mocking ... This fixes some poorly-conceived mocking that was done because of some equally dumb imports being done in salt/modules/junos.py (which I fixed a few commits ago while in the process of cleaning up the docs).	2018-05-31 15:28:25 -05:00
Erik Johnson	bc9e3acef3	Lint fixes	2018-05-31 15:28:25 -05:00
Erik Johnson	d37f7e4f04	Add 2017.7.6 release notes	2018-05-31 15:28:25 -05:00
Erik Johnson	9dddeeefab	Improve documentation on syncing states	2018-05-31 15:28:25 -05:00
Erik Johnson	f465fa3ca7	Add best practices docs for writing states	2018-05-31 15:28:25 -05:00
Erik Johnson	93ee5ee2b0	Fix all Sphinx warnings ... Well, all but one, which we expect to see	2018-05-31 15:28:25 -05:00
Erik Johnson	64b9b4d0b8	Clarify that name would override the id declaration	2018-05-31 15:28:24 -05:00
Nicole Thomas	63efb76d51	Merge pull request #47822 from Ch3LL/win_user_test ... Add user state integration tests to windows	2018-05-30 17:13:06 -04:00
Ch3LL	3a691b405f	add user_home path for both windows and linux	2018-05-30 14:22:10 -04:00
Nicole Thomas	b9da4f1221	Merge pull request #47876 from doesitblend/add-file-read-windows ... Add file read windows	2018-05-30 10:03:54 -04:00
Nicole Thomas	cbe2ecfae8	Merge pull request #47882 from frogunder/45013 ... add whoami test	2018-05-30 09:47:12 -04:00
Frode Gundersen	38d114a2d2	add whoami test	2018-05-29 21:51:02 +00:00
Ken Jordan	3f7e7ec327	Add file.read function to Windows module	2018-05-29 15:28:21 -06:00
Daniel A. Wozniak	ebc7cde9cb	Revert job chunk wait time change ... Reverting the sleep time from 0.0001 back to 0.01, sleeping such a short amount of time eats up CPU resources needlessly.	2018-05-29 12:34:35 -07: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	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	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	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
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
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