rallytime 3f74d697b9 Merge branch '2016.11' into 'develop' ... Conflicts: - pkg/windows/build_pkg.bat - salt/modules/archive.py		2017-01-20 12:07:19 -07:00
..
schemas	Fix SSH Roster Schema unittests	2015-07-28 12:37:19 +01:00
__init__.py	Implemented RosterEntryConfig and added unit tests for it	2015-07-28 00:42:55 +01:00
api_test.py	Pylint fix: add line at end of file	2017-01-17 10:26:43 -07:00
config_test.py	Merge pull request #38490 from eradman/cloud_config	2017-01-05 16:35:41 -07:00