6 Commits

Author	SHA1	Message	Date
rallytime	f552dd63f3	Merge branch '2016.11' into 'nitrogen' ... Conflicts: - pkg/windows/installer/Salt-Minion-Setup.nsi - tests/unit/states/test_tomcat.py	2017-04-14 10:46:56 -06:00
Pedro Algarvio	d397763553	Adjust to the new LoaderModuleMockMixin usage	2017-03-28 19:03:59 +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