10 Commits

Author	SHA1	Message	Date
rallytime	25f03ae425	Merge branch '2017.7' into '2018.3' ... Conflicts: - tests/integration/modules/test_status.py - tests/integration/states/test_pip_state.py - tests/support/case.py - tests/whitelist.txt	2018-05-09 11:24:02 -04:00
Ch3LL	1a7ffb4e0d	return error if diskusage not available	2018-05-01 13:11:23 -04:00
Ch3LL	10bd63a976	Skip status.diskusage integration tests on macsox	2018-04-30 14:44:34 -04:00
rallytime	120c5446b7	Update old utils paths to new utils paths	2018-04-19 17:25:55 -04:00
rallytime	4718d31e53	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/config/__init__.py - salt/minion.py - salt/modules/pip.py - salt/states/pip_state.py - salt/states/virtualenv_mod.py - tests/integration/modules/test_status.py	2018-04-19 17:15:20 -04:00
Ch3LL	25a84428b8	Add status module integration modules tests for Windows	2018-04-19 12:01:40 -04:00
Erik Johnson	06ec8db7e2	[PY3] Add unicode_literals to more high-priority states/modules	2018-01-22 08:26:28 -06:00
rallytime	bbe6f54f84	Update old utils paths to new paths	2018-01-12 12:27:08 -05:00
Frode Gundersen	619bd2be1e	fix lint error	2017-11-22 21:41:59 +00:00
Frode Gundersen	d406cb07a3	add status.pid test	2017-11-22 18:11:39 +00:00