Thomas S Hatch 6aa5b0f858 Merge branch '2014.7' into develop ... Conflicts: salt/modules/genesis.py salt/modules/parted.py salt/modules/win_service.py salt/runner.py salt/states/file.py tests/integration/netapi/rest_tornado/test_app.py		2014-11-26 09:24:24 -07:00
..
index.rst	Updated all saltapi import paths to salt.netapi	2014-06-18 20:56:16 -06:00
salt.netapi.rest_cherrypy.rst	Url should be '/keys'	2014-11-20 11:16:58 +08:00
salt.netapi.rest_tornado.rst	Clean up doc build so it doesn't stacktrace	2014-11-25 15:11:15 -07:00
salt.netapi.rest_wsgi.rst	Renamed old autodoc-generated salt-api netapi module filenames	2014-06-19 13:19:24 -06:00