14 Commits

Author	SHA1	Message	Date
Colton Myers	73b90f155e	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/topics/cloud/gce.rst doc/topics/windows/windows-package-manager.rst salt/client/ssh/state.py salt/cloud/clouds/ec2.py salt/modules/defaults.py salt/modules/file.py salt/utils/cloud.py	2015-09-29 14:56:41 -06:00
Mike Place	0bc37c0d41	Fix test	2015-09-28 12:57:22 -06:00
Pedro Algarvio	60f215f191	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
Justin Findlay	f09b8e3873	remove redundant mock_open() in darwin_sysctl_test.py	2014-10-31 10:42:57 -06:00
Pedro Algarvio	faf3157637	Skip tests if real mock library is not available	2014-08-08 00:46:21 +01:00
rallytime	d5c2a92d24	Fix typo in email from bad copy-paste	2014-07-07 16:12:11 -06:00
rallytime	27985060e2	Integration tests started for darwin_sysctl module	2014-03-25 13:52:54 -06:00
rallytime	334021d4a6	Removed unused variable	2014-03-25 11:21:47 -06:00
rallytime	b17164cfe8	More darwin_sysctl tests	2014-03-25 11:18:04 -06:00
rallytime	f192e8c202	Pylint fix	2014-03-25 08:26:40 -06:00
rallytime	81d29874ac	Empty bottom line - pylint!	2014-03-24 13:06:09 -06:00
rallytime	ce52e33979	pylint	2014-03-24 13:04:35 -06:00
rallytime	1da1f32040	more darwin_sysctl module unit tests	2014-03-24 12:59:12 -06:00
rallytime	cfd86eeb49	Started unit tests for darwin_sysctl module	2014-03-24 12:22:17 -06:00