rallytime 9064d3bbfb Merge branch '2015.5' into '2015.8' ... Conflicts: - salt/cloud/clouds/vmware.py - salt/modules/file.py - salt/states/archive.py		2016-04-25 15:45:17 -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.5' into '2015.8'	2016-04-25 15:45:17 -06:00
__init__.py	Don't forget the blank lines at the end of the file	2015-04-24 16:29:51 -06:00