86026 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
rallytime	b75f5ae38e	Merge branch '2017.7.6' into '2017.7' ... No conflicts.	2018-05-22 15:10:49 -04:00
Nicole Thomas	edf94c915e	Merge pull request #47775 from gtmanfred/2017.7.6 ... catch UnsupportedOperation with AssertionError	2018-05-22 15:04:12 -04:00
Daniel Wallace	548f65d056	catch UnsupportedOperation with AssertionError	2018-05-22 12:43:16 -05:00
rallytime	17596f3025	Merge branch '2017.7.6' into '2017.7' ... No conflicts.	2018-05-22 11:26:44 -04:00
Nicole Thomas	8c38ecd75f	Merge pull request #47769 from gtmanfred/2017.7.6 ... skip test that breaks test suite	2018-05-22 11:12:53 -04:00
Daniel Wallace	3fdfc0fa82	skip test that breaks test suite	2018-05-21 17:42:35 -05:00
rallytime	e458f4a031	Merge branch '2017.7.6' into '2017.7' ... No conflicts.	2018-05-21 10:34:10 -04:00
Nicole Thomas	0d5b473ce2	Merge pull request #47747 from Ch3LL/rn_2017.7.6 ... Add changelog to 2017.7.6 release notes	2018-05-21 10:24:59 -04:00
Nicole Thomas	27fbb42210	Merge pull request #47737 from dwoz/win_timeout ... Cloud test fixup	2018-05-21 10:19:48 -04:00
Ch3LL	d4aa83b92d	Add changelog to 2017.7.6 release notes	2018-05-21 10:01:00 -04:00
Daniel A. Wozniak	e88833a07d	Cloud test fixup ... - Increase winrm timeout - Ignore winrm tests when dependencies are missing	2018-05-20 01:24:03 -07:00
Nicole Thomas	1a93f060fb	Merge pull request #47729 from UtahDave/fix_get_info_doc ... fix cli example to match function name	2018-05-19 07:31:20 -04:00
Nicole Thomas	8a5b34f7d9	Merge pull request #47702 from damon-atkins/2017.7.6_fix_pkg.latest_state ... State pkg.latest called win pkg.install with list of pkgs and the required versions	2018-05-19 07:21:22 -04:00
Damon Atkins	adcc094e08	Merge branch '2017.7.6' into 2017.7.6_fix_pkg.latest_state	2018-05-19 12:40:51 +10:00
Damon Atkins	d51662e053	Ensure targeted_pkgs always contains value for non-windows.	2018-05-19 05:23:19 +10:00
Nicole Thomas	d610c192d9	Merge pull request #47700 from yannj-fr/2017.7.6 ... fix roots modification time check	2018-05-18 14:42:16 -04:00
David Boucha	443a2d72a2	fix cli example to match function name	2018-05-18 10:51:46 -06:00
Nicole Thomas	00a13761c7	Merge pull request #47682 from terminalmage/issue47182 ... Fix traceback when excludes are present in an included SLS file	2018-05-18 12:47:46 -04:00
Yann Jouanin	961c1ef61e	fix roots modification time check	2018-05-18 17:59:26 +02:00
Yann Jouanin	aef37dd1ce	fix roots modification time check	2018-05-18 17:58:01 +02:00
Yann Jouanin	2a73e905df	Merge branch '2017.7.6' into 2017.7.6	2018-05-18 17:54:05 +02:00
Nicole Thomas	518f7bcc62	Merge pull request #47708 from darkpixel/47696-do-not-enumerate-none ... Wrap properties loop with a check for None. Closes GH-47696	2018-05-18 11:25:43 -04:00
Nicole Thomas	266749420f	Merge pull request #47632 from gtmanfred/2017.7.6 ... handle new _create_stream in tornado 5.0	2018-05-18 10:25:16 -04:00
Nicole Thomas	2643c356af	Merge pull request #47720 from rallytime/bp-47692-2017.7.6 ... Back-port #47692 to 2017.7.6	2018-05-18 09:23:02 -04:00
Daniel A. Wozniak	6e5cb36839	Default windows to m1.small for ec2-classic	2018-05-18 09:21:33 -04:00
Aaron C. de Bruyn	54e9bf9ec9	Merge branch '2017.7' into 47696-do-not-enumerate-none	2018-05-17 21:34:53 -07:00
Aaron C. de Bruyn	95d4488f01	Merge branch '2017.7.6' into 47696-do-not-enumerate-none	2018-05-17 14:34:16 -07:00
Nicole Thomas	cad062eaa7	Merge pull request #47681 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.6 to 2017.7	2018-05-17 17:30:01 -04:00
Nicole Thomas	fd2d45d9c2	Merge pull request #47683 from Ch3LL/mac_user_test ... Remove unnecessary setUp in states.test_user test for mac	2018-05-17 17:28:25 -04:00
Aaron C. de Bruyn	041e4c6ddb	Wrap properties loop with a check for None. Closes GH-47696	2018-05-17 10:53:50 -07:00
Damon Atkins	83b4224cf8	Adjusted based on feed back.	2018-05-18 03:34:00 +10:00
Damon Atkins	12f983ce9f	Whitespace lint issues	2018-05-18 02:18:35 +10:00
Nicole Thomas	f323799c42	Merge pull request #47692 from dwoz/win_instance_type ... Default windows to m1.small for ec2-classic	2018-05-17 10:44:10 -04:00
Daniel Wallace	2c50c0d2f5	fix pylint	2018-05-17 08:41:32 -05:00
Daniel Wallace	4a29057b16	Fix last test for tornado ... Thank you so much @bdarnell for helping me get this last fix. With this, the test suite passes with tornado 5.	2018-05-17 08:41:32 -05:00
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
Damon Atkins	075d3d3c49	pkg.install execution module on windows ensures the software package is ... installed when no version is specified, it does not upgrade the software to the latest. This is per the design. pkg.latest must provide the versions to install to pkg.install	2018-05-17 23:04:31 +10:00
Yann Jouanin	20d9785244	fix roots modification time check	2018-05-17 13:50:51 +02:00
Daniel A. Wozniak	20b6070d54	Default windows to m1.small for ec2-classic	2018-05-16 14:37:07 -07:00
Erik Johnson	d0243e8f23	Suppress spurious lint failure ... This is failing because elsewhere in the test module the get_top() member function returns None, but this is done in a highstate attribute which is cleaned up in the tearDown and established as a fresh salt.state.HighState instance in the setUp.	2018-05-16 15:13:54 -05:00
Ch3LL	5a1b25b9c7	Remove unnecessary setUp in states.test_user test for mac	2018-05-16 13:54:19 -04:00
Erik Johnson	3b449f11fc	Add regression test for excludes issue	2018-05-16 12:26:46 -05:00
rallytime	6c06cb3ae3	Merge branch '2017.7.6' into '2017.7' ... No conflicts.	2018-05-16 12:46:26 -04:00
Nicole Thomas	990ece5cd5	Merge pull request #47665 from gtmanfred/cloud ... use dictupdate to update the providers dictionary and merge lists	2018-05-16 11:59:16 -04: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
Erik Johnson	28a7d2b81c	Skip __exclude__ in find_sls_ids ... The corresponding value would be a list and thus raises a TypeError when attempting to perform a dict lookup.	2018-05-16 10:11:31 -05:00
Nicole Thomas	a2ed8cbb7f	Merge pull request #47151 from zer0def/configparser-defaultsect ... Allow interaction with default section in ConfigParser serializer	2018-05-16 09:53:43 -04:00
Nicole Thomas	e6fb8342ef	Merge pull request #47673 from terminalmage/bp-45808 ... Backport #45808 to 2017.7	2018-05-16 09:52:04 -04:00
andrei	454291ad62	Fix errors when attempting to cache files with long names or URLs	2018-05-15 22:39:09 -05:00