8 Commits

Author	SHA1	Message	Date
rallytime	bbe6f54f84	Update old utils paths to new paths	2018-01-12 12:27:08 -05:00
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	b4b59b89cd	remove platform from salt.utils call for 2017.7	2018-01-04 14:42:30 -05:00
Ch3LL	85e853a63d	Add darwin value for ssh grain items tests on MacOSX	2018-01-03 13:58:28 -05:00
Erik Johnson	8cdb9ea54f	[PY3] Add print_function import to files with unicode_literals already added ... This makes the 2.x usage invalid syntax and forces the use of print as a function. This adds the import to the files which I've updated in the last couple of days but forgot to add it.	2017-12-15 12:14:18 -06:00
Erik Johnson	239fc8d774	[PY3] Add unicode literals to the clients and associated files/tests	2017-12-15 00:19:55 -06:00
rallytime	59ddde4671	Update old util paths to new paths	2017-11-13 12:35:31 -05:00
Ch3LL	5d1a9af4b5	Add salt-ssh grains.items test	2017-11-08 13:41:11 -05:00