rallytime 2222e1cae9 Merge branch '2016.11' into 'develop' ... Conflicts: - salt/modules/napalm_network.py - tests/integration/states/test_archive.py - tests/integration/states/test_file.py - tests/unit/modules/test_docker.py		2017-03-21 10:19:52 -06:00
..
schemas	Use salt.utils.versions instead of distutils.version	2017-03-08 19:22:33 +00:00
__init__.py	Implemented RosterEntryConfig and added unit tests for it	2015-07-28 00:42:55 +01:00
test_api.py	Move whatever we need from salttesting to salt.	2017-02-28 22:52:49 +00:00
test_config.py	Merge branch '2016.11' into 'develop'	2017-03-21 10:19:52 -06:00