5 Commits

Author	SHA1	Message	Date
rallytime	c673b64583	Merge branch '2016.11' into '2017.7' ... Conflicts: - doc/conf.py - doc/ref/configuration/master.rst - doc/ref/configuration/minion.rst - salt/engines/hipchat.py - salt/engines/slack.py - salt/grains/core.py - salt/version.py - tests/integration/states/test_renderers.py	2017-07-20 09:54:08 -06: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