rallytime 80fcdfb9d8 Merge branch '2015.8' into '2016.3' ... Conflicts: - doc/topics/targeting/grains.rst - salt/cli/daemons.py - salt/exceptions.py - salt/minion.py - salt/modules/schedule.py - salt/scripts.py - salt/states/archive.py		2016-04-26 12:07:42 -06:00
..
rest_cherrypy	Rename the rest_cherrypy tests to conform to our convention	2015-09-09 10:39:34 -06:00
rest_tornado	Merge branch '2015.8' into '2016.3'	2016-04-26 12:07:42 -06:00
__init__.py	Don't forget the blank lines at the end of the file	2015-04-24 16:29:51 -06:00