rallytime cbf42a8407 Merge branch '2016.3' into 'develop' ... Conflicts: - conf/master - doc/ref/configuration/master.rst - salt/cli/batch.py - salt/cli/daemons.py - salt/config/__init__.py - salt/minion.py - salt/modules/aptpkg.py - salt/modules/beacons.py - salt/states/archive.py - salt/states/cmd.py - salt/utils/gitfs.py - tests/unit/states/cmd_test.py		2016-04-26 14:42:26 -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 '2016.3' into 'develop'	2016-04-26 14:42:26 -06:00
__init__.py	Don't forget the blank lines at the end of the file	2015-04-24 16:29:51 -06:00