4 Commits

Author	SHA1	Message	Date
rallytime	f078d57b57	Merge branch '2016.3' into 'develop' ... Conflicts: - salt/modules/rabbitmq.py - salt/modules/win_servermanager.py - salt/state.py - salt/states/boto_s3_bucket.py - salt/states/pip_state.py - salt/states/win_servermanager.py - tests/unit/modules/win_servermanager_test.py - tests/unit/states/dockerng_test.py	2016-06-09 13:06:10 -06:00
Justin Findlay	87e018af2a	states.test.configurable_test_state: add unit tests	2016-06-02 17:20:36 -06:00
Kevin Quinn	581f9d328a	Fix 'present' option when used without 'key_type' (#32965)	2016-05-05 07:27:30 -07:00
Rahul Handay	1f4cf86500	Adding states/test.py unit tests	2015-05-18 21:18:47 +05:30