Merge branch 'api-recursor-readonly' of github.com:zeha/pdns into zeha-api-recursor...

Conflicts:
	pdns/pdns_recursor.cc

diff --cc pdns/pdns_recursor.cc
index 7a35121e4ed79077359d0f844064e877933b689d,3c4f96be58852693e04c6fbbe748689c4fafbbbf..d5a1eb274c465ba61ca0ce9f8d29b65bed36773a
--- 1/pdns/pdns_recursor.cc
--- 2/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@@ -2099,9 -2091,7 +2099,10 @@@ int main(int argc, char **argv
      ::arg().set("experimental-webserver-port", "Port of webserver to listen on") = "8082";
      ::arg().set("experimental-webserver-password", "Password required for accessing the webserver") = "";
      ::arg().set("experimental-api-config-dir", "Directory where REST API stores config and zones") = "";
 +    ::arg().set("carbon-ourname", "If set, overrides our reported hostname for carbon stats")="";
 +    ::arg().set("carbon-server", "If set, send metrics in carbon (graphite) format to this server")="";
 +    ::arg().set("carbon-interval", "Number of seconds between carbon (graphite) updates")="30";
+     ::arg().set("experimental-api-readonly", "If the JSON API should disallow data modification") = "no";
      ::arg().set("quiet","Suppress logging of questions and answers")="";
      ::arg().set("logging-facility","Facility to log messages as. 0 corresponds to local0")="";
      ::arg().set("config-dir","Location of configuration directory (recursor.conf)")=SYSCONFDIR;

diff --cc pdns/ws-recursor.cc
Simple merge