rallytime bfcfcd75e8 Merge branch '2017.7' into 'develop' ... Conflicts: - salt/fileclient.py - salt/loader.py - salt/minion.py - salt/modules/alternatives.py - salt/modules/genesis.py - tests/unit/modules/test_hosts.py - tests/unit/modules/test_ini_manage.py		2017-09-13 15:15:04 -04:00
..
__init__.py	Fix pylint errors in tests	2013-11-27 10:50:55 -07:00
test_local_cache.py	Merge branch '2017.7' into 'develop'	2017-09-13 15:15:04 -04:00
test_smtp_return.py	Drop @patch usage	2017-04-28 13:36:42 +01:00