9 Commits

Author	SHA1	Message	Date
rallytime	92c9317a25	Update old utils paths to use new paths	2018-07-31 18:20:35 -04:00
rallytime	15bfba7143	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/slsutil.py - salt/modules/win_timezone.py - salt/states/pkg.py - tests/integration/states/test_pkg.py	2018-07-31 18:18:58 -04:00
Ch3LL	de95a6a215	add unused import to timezone test file	2018-07-27 15:42:35 -04:00
Ch3LL	f09d1a2c7e	Add timzeon windows integration tests and fix get_zone	2018-07-26 16:44:55 -04:00
rallytime	c08c67f3d4	Add unicode_literals to modules, states, and related tests	2018-01-23 15:26:25 -05:00
Pedro Algarvio	2ee6d5d589	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
Pedro Algarvio	40a64191a1	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +00:00
Pedro Algarvio	3beb3fb801	Move whatever we need from salttesting to salt. ... Let's drop the salttesting dependency cycle.	2017-02-28 22:52:49 +00:00
Pedro Algarvio	15af4c9728	Test filenames conformity. Adjust for pytest.	2017-02-23 23:19:42 +00:00