6 Commits

Author	SHA1	Message	Date
rallytime	616ac7289b	Merge branch '2016.11' into 'nitrogen' ... Conflicts: - salt/config/__init__.py - salt/modules/elasticsearch.py - tests/integration/__init__.py	2017-05-23 10:36:41 -06:00
Pedro Algarvio	7b713d9256	Use the more portable helper skip_if_not_root.	2017-04-04 18:58:21 +01:00
Pedro Algarvio	a15aa32404	Proper mocking.	2017-04-01 14:22:59 +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