6 Commits

Author	SHA1	Message	Date
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
rallytime	b4366103a6	Merge branch '2016.11' into 'develop' ... Conflicts: - .pylintrc - .testing.pylintrc - salt/fileclient.py - salt/minion.py - salt/modules/docker.py - salt/modules/win_iis.py - salt/states/docker.py - salt/states/file.py - salt/utils/__init__.py - tests/integration/modules/test_sysmod.py	2017-02-27 15:11:37 -07:00
Mike Place	b6dea5efb9	Correct small bug with docs test.	2017-02-27 09:59:25 -07:00
Pedro Algarvio	15af4c9728	Test filenames conformity. Adjust for pytest.	2017-02-23 23:19:42 +00:00