7 Commits

Author	SHA1	Message	Date
Erik Johnson	ce6fccde9c	[PY3] Add unicode_literals to states/modules (A)	2018-01-14 01:31:52 -06:00
rallytime	71f3c73150	Merge branch '2016.11' into 'develop' ... Conflicts: - salt/template.py - salt/utils/pycrypto.py - tests/integration/modules/test_state.py - tests/unit/states/test_artifactory.py - tests/unit/test_template.py	2017-04-05 13:02:14 -06:00
Pedro Algarvio	99bc71dc4e	Proper mocking.	2017-03-28 19:04:01 +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	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