rallytime d724ed3a47 Merge branch '2015.2' into 'develop' ... Conflicts: salt/cli/batch.py salt/cloud/clouds/msazure.py tests/integration/netapi/rest_tornado/test_app.py		2015-01-16 11:36:32 -07:00
..
rest_cherrypy	Make PyLint ignore unused imports	2014-11-20 16:40:47 +00:00
rest_tornado	Merge branch '2015.2' into 'develop'	2015-01-16 11:36:32 -07:00
__init__.py	Fix lint errors	2014-10-08 01:02:11 +01:00
test_client.py	Temporarily change this test to work around race condition in the runnerclient	2015-01-10 00:18:16 -08:00