From d338a098122ff95338d650d13c6d2048a14bc68e Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Mon, 26 Jun 2017 17:33:07 +0200
Subject: [PATCH] Remove `mapping.single_type` from parent join test (#25391)

This removes the remaining usage of `mapping.single_type` from the parent join
module and moves it's bwc test to the mixed cluster tests

Relates to #24961
Relates to #20257
---
 .../src/test/resources/rest-api-spec/test/11_parent_child.yml   | 2 --
 .../src/test/resources/rest-api-spec/test/20_parent_join.yml    | 2 --
 .../src/test/resources/rest-api-spec/test/10_parent_child.yml   | 2 --
 3 files changed, 6 deletions(-)
 rename {modules/parent-join => qa/mixed-cluster}/src/test/resources/rest-api-spec/test/10_parent_child.yml (95%)

diff --git a/modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml b/modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml
index d82e0bb75e3..50f4d55750d 100644
--- a/modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml
+++ b/modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml
@@ -3,8 +3,6 @@ setup:
       indices.create:
         index: test
         body:
-            settings:
-              mapping.single_type: true
             mappings:
               doc:
                 properties:
diff --git a/modules/parent-join/src/test/resources/rest-api-spec/test/20_parent_join.yml b/modules/parent-join/src/test/resources/rest-api-spec/test/20_parent_join.yml
index 4e461ce5464..bc894497130 100644
--- a/modules/parent-join/src/test/resources/rest-api-spec/test/20_parent_join.yml
+++ b/modules/parent-join/src/test/resources/rest-api-spec/test/20_parent_join.yml
@@ -3,8 +3,6 @@ setup:
       indices.create:
         index: test
         body:
-          settings:
-            mapping.single_type: true
           mappings:
             doc:
               properties:
diff --git a/modules/parent-join/src/test/resources/rest-api-spec/test/10_parent_child.yml b/qa/mixed-cluster/src/test/resources/rest-api-spec/test/10_parent_child.yml
similarity index 95%
rename from modules/parent-join/src/test/resources/rest-api-spec/test/10_parent_child.yml
rename to qa/mixed-cluster/src/test/resources/rest-api-spec/test/10_parent_child.yml
index 29a50c64f28..fb0462acd1a 100644
--- a/modules/parent-join/src/test/resources/rest-api-spec/test/10_parent_child.yml
+++ b/qa/mixed-cluster/src/test/resources/rest-api-spec/test/10_parent_child.yml
@@ -3,8 +3,6 @@ setup:
       indices.create:
         index: test
         body:
-            settings:
-              mapping.single_type: false
             mappings:
               type_2: {}
               type_3: