rallytime d24776f5e9 Merge branch '2015.8' into '2016.3' ... Conflicts: - conf/master - doc/topics/netapi/index.rst - salt/netapi/__init__.py		2017-01-15 16:07:55 -07:00
..
rest_cherrypy	netapi.rest_cherrypy: use unsalted PW on MacOS (#32850)	2016-04-26 11:04:25 -06:00
rest_tornado	Clean up tests and docs for batch execution	2017-01-09 11:29:34 -07:00
__init__.py	Fix lint errors	2014-10-08 01:02:11 +01:00
test_client.py	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-04-16 12:15:44 -06:00