4 Commits

Author	SHA1	Message	Date
rallytime	52edbffc85	Merge branch '2016.11' into 'develop' ... Conflicts: - doc/ref/cache/all/index.rst - doc/topics/cache/index.rst - salt/cache/localfs.py - salt/modules/boto_rds.py - salt/roster/cloud.py - salt/states/virtualenv_mod.py - tests/integration/states/test_archive.py - tests/unit/modules/test_dockermod.py - tests/unit/states/dockerng_test.py	2017-03-28 17:09:30 -06: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	5fb0aa5dcf	Code cleanup	2017-02-24 00:49:31 +00:00
Pedro Algarvio	15af4c9728	Test filenames conformity. Adjust for pytest.	2017-02-23 23:19:42 +00:00