7 Commits

Author	SHA1	Message	Date
rallytime	ef0df4a954	Merge branch '2016.11' into 'nitrogen' ... Conflicts: - salt/modules/win_network.py - salt/modules/win_pkg.py - salt/utils/gitfs.py - tests/unit/modules/test_win_network.py - tests/unit/states/test_file.py	2017-05-09 14:32:49 -06:00
Pedro Algarvio	d397763553	Adjust to the new LoaderModuleMockMixin usage	2017-03-28 19:03:59 +01:00
Pedro Algarvio	9b1e55aa85	Import the full module namespace to avoid import shadowing. ... https://github.com/saltstack/salt/pull/39996#issuecomment-287857698	2017-03-28 19:02:47 +01:00
Pedro Algarvio	5216ff0932	Code cleanup. Proper mocking	2017-03-28 19:00:52 +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