From: Christian Hofstaedtler Date: Tue, 20 May 2014 19:20:18 +0000 (+0200) Subject: Drop experimental-json-interface from tests and doc X-Git-Tag: rec-3.6.0-rc1~13^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=542ad39cd6a53b080d40541f4095017e4c41aaa7;p=thirdparty%2Fpdns.git Drop experimental-json-interface from tests and doc --- diff --git a/pdns/docs/web-api.md b/pdns/docs/web-api.md index 87bc3b12b9..302c403502 100644 --- a/pdns/docs/web-api.md +++ b/pdns/docs/web-api.md @@ -49,7 +49,7 @@ For now, only enabled if the 'experimental-json-interface' parameter is configur API calls for the PowerDNS Recursor ----------------------------------- -For now, only enabled if the 'experimental-json-interface' parameter is configured, as this API is not yet fully stable. +For now, only enabled if the 'experimental-webserver' parameter is configured, as this API is not yet fully stable. * flush-cache Flush from the cache the domain specified in the parameter 'domain' diff --git a/regression-tests.api/runtests.py b/regression-tests.api/runtests.py index 0531ccdabc..483a519b7c 100755 --- a/regression-tests.api/runtests.py +++ b/regression-tests.api/runtests.py @@ -90,7 +90,7 @@ else: with open(conf_dir+'/example.com..conf', 'w') as conf_file: conf_file.write(REC_EXAMPLE_COM_CONF_TPL) - pdnscmd = ("../pdns/pdns_recursor --daemon=no --socket-dir=. --config-dir=. --allow-from-file=acl.list --local-port=5555 --experimental-json-interface=yes --experimental-webserver=yes --experimental-webserver-port="+WEBPORT+" --experimental-webserver-address=127.0.0.1 --experimental-webserver-password="+WEBPASSWORD).split() + pdnscmd = ("../pdns/pdns_recursor --daemon=no --socket-dir=. --config-dir=. --allow-from-file=acl.list --local-port=5555 --experimental-webserver=yes --experimental-webserver-port="+WEBPORT+" --experimental-webserver-address=127.0.0.1 --experimental-webserver-password="+WEBPASSWORD).split() # Now run pdns and the tests.