11 Commits

Author	SHA1	Message	Date
Seth House	6d22514934	Rename the rest_cherrypy tests to conform to our convention ... Previously they conformed to the default unittest2 convention.	2015-09-09 10:39:34 -06:00
Colton Myers	befb666623	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: salt/modules/mongodb.py salt/utils/http.py salt/utils/process.py tests/integration/__init__.py	2015-04-27 10:28:53 -06:00
rallytime	8d5b50e17c	Don't forget the blank lines at the end of the file	2015-04-24 16:29:51 -06:00
Pedro Algarvio	60f215f191	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
Pedro Algarvio	0937d2b4e1	Use urlencode from six	2014-11-20 16:40:45 +00:00
Seth House	66e2b54f36	Added encoding comment to empty init files	2014-06-19 17:37:44 -06:00
Seth House	d00cd104ac	And yet more pylint fixes	2014-06-19 17:25:56 -06:00
Pedro Algarvio	7590586d05	Don't fail on missing CherryPy	2014-06-19 13:00:38 +01:00
Seth House	1d4057fadf	Updated all saltapi import paths to salt.netapi	2014-06-18 20:56:16 -06:00
Seth House	ea7eccd0ea	"serialized" -> "unserialized" ... This was backward.	2014-03-31 10:15:27 -06:00
Seth House	bb9ff7aa6a	First stab at unit tests for the various rest_cherrypy tool functions	2014-03-31 09:59:55 -06:00