Merge pull request #8623 from jonathaneen/accept_combination_delete_replace_for_rrset

Make a combination of delete and replace for rrset possible

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

diff --cc pdns/ws-auth.hh
index 79f8f2f6b6fd38af83a687ced2ff21aa43b2a710,a8ffe17adc071ace437e044e779a243e64019cba..2cd127345fadae064a349f2585dc6c61669f5c70
--- 1/pdns/ws-auth.hh
--- 2/pdns/ws-auth.hh
+++ b/pdns/ws-auth.hh
@@@ -19,8 -19,10 +19,9 @@@
   * along with this program; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
 -#ifndef WS_HH
 -#define WS_HH
 +#pragma once
  #include <string>
+ #include <tuple>
  #include <map>
  #include <time.h>
  #include <pthread.h>

diff --cc regression-tests.api/test_Zones.py
Simple merge