From f87899e01e9d6f996cc91e24549a0efd91ac587c Mon Sep 17 00:00:00 2001
From: Ray Lee <ray.lee@lyrasis.org>
Date: Sat, 25 Apr 2020 10:27:16 -0400
Subject: [PATCH] NOJIRA: Add merge:action directive on
 elasticSearchIndexConfig in tenant bindings.

---
 .../services/tenants/anthro/anthro-tenant-bindings.delta.xml    | 2 +-
 .../services/tenants/fcart/fcart-tenant-bindings.delta.xml      | 2 +-
 .../tenants/materials/materials-tenant-bindings.delta.xml       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml
index 4a816804a..5511e5114 100644
--- a/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml
@@ -12,7 +12,7 @@
 			org.collectionspace.services.nuxeo.elasticsearch.anthro.AnthroESDocumentWriter
 		</tenant:elasticSearchDocumentWriter>
 
-		<tenant:elasticSearchIndexConfig>
+		<tenant:elasticSearchIndexConfig merge:action="replace">
 			<tenant:mapping merge:action="replace">
 				{
 					// For now, don't index a field unless there's a mapping explicitly defined. This keeps the
diff --git a/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml
index 90bdc32d7..8af5e5dd2 100644
--- a/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml
@@ -8,7 +8,7 @@
 	<!-- value in cspace/config/services/tenants/fcart-tenant-bindings-proto.xml -->
 
 	<tenant:tenantBinding id="1000">
-		<tenant:elasticSearchIndexConfig>
+		<tenant:elasticSearchIndexConfig merge:action="replace">
 			<tenant:mapping merge:action="replace">
 				{
 					// For now, don't index a field unless there's a mapping explicitly defined. This keeps the
diff --git a/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml
index b5b29b1d6..796ccea4d 100644
--- a/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml
@@ -12,7 +12,7 @@
           org.collectionspace.services.nuxeo.elasticsearch.materials.MaterialsESDocumentWriter
         </tenant:elasticSearchDocumentWriter>
 
-        <tenant:elasticSearchIndexConfig>
+        <tenant:elasticSearchIndexConfig merge:action="replace">
             <tenant:mapping merge:action="replace">
               {
                 // For now, don't index a field unless there's a mapping explicitly defined. This keeps the
-- 
2.47.3