11 Commits

Author	SHA1	Message	Date
rallytime	59076f5ee8	Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/client/ssh/wrapper/state.py - salt/modules/yumpkg.py	2018-01-04 17:45:29 -05:00
Ch3LL	74e6ed60ea	Fix MacOSX Service Status Check and integration test	2018-01-03 17:19:51 -05:00
rallytime	f26beffe48	Update old utils paths to new paths	2017-11-05 20:39:40 -07:00
Ch3LL	dd5c823210	remove skipIf import	2017-10-27 15:01:32 -04:00
Ch3LL	ff92f31cbe	remove skipif for docker	2017-10-26 14:43:31 -04:00
Ch3LL	c13f37eee4	change service name depending on os	2017-10-26 11:44:38 -04:00
Ch3LL	980c43ebc9	change skip message check to docker	2017-10-25 13:43:13 -04:00
Ch3LL	3955537609	change skip if check to docker	2017-10-25 13:40:58 -04:00
Ch3LL	aa8875a0e2	change service name to docker	2017-10-25 13:39:46 -04:00
Ch3LL	654071028b	change service to crond	2017-10-24 16:26:31 -04:00
Ch3LL	7911b4b3eb	Add service.status integration test	2017-10-24 16:25:19 -04:00