rallytime 9220ea0729 Merge branch '2016.3' into 'develop' ... Conflicts: - doc/conf.py - salt/minion.py - salt/modules/mac_brew.py - salt/modules/pkgng.py - salt/states/apache_module.py - salt/states/ini_manage.py - salt/states/win_servermanager.py		2016-06-02 10:13:34 -04:00
..
__init__.py	cache runner test: add new unit tests	2015-11-18 16:33:46 -07:00
cache_test.py	Updated tests to work with code deprecations	2016-02-11 11:22:35 -07:00
jobs_test.py	fix jobs.list_jobs failing with search_target	2016-05-24 17:56:45 -07:00