From d8d5bb36831a332b0422983b6958cdeffdcb25eb Mon Sep 17 00:00:00 2001
From: Areek Zillur <areek.zillur@elasticsearch.com>
Date: Wed, 15 Jun 2016 15:48:21 -0400
Subject: [PATCH 1/2] xpack fixes for elasticsearchelastic/elasticsearch#18732

Original commit: elastic/x-pack-elasticsearch@fdb1cea1db55fb565d8ff0ecc6f6463ca6b1fb30
---
 .../accesscontrol/ShieldIndexSearcherWrapperUnitTests.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authz/accesscontrol/ShieldIndexSearcherWrapperUnitTests.java b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authz/accesscontrol/ShieldIndexSearcherWrapperUnitTests.java
index 15a9de93d97..b32682c9423 100644
--- a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authz/accesscontrol/ShieldIndexSearcherWrapperUnitTests.java
+++ b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authz/accesscontrol/ShieldIndexSearcherWrapperUnitTests.java
@@ -36,6 +36,7 @@ import org.apache.lucene.util.FixedBitSet;
 import org.apache.lucene.util.IOUtils;
 import org.apache.lucene.util.SparseFixedBitSet;
 import org.elasticsearch.common.compress.CompressedXContent;
+import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.lucene.index.ElasticsearchDirectoryReader;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
@@ -93,7 +94,7 @@ public class ShieldIndexSearcherWrapperUnitTests extends ESTestCase {
                 Collections.emptyMap(), Collections.emptyMap());
         SimilarityService similarityService = new SimilarityService(indexSettings, Collections.emptyMap());
         mapperService = new MapperService(indexSettings, analysisService, similarityService,
-                new IndicesModule().getMapperRegistry(), () -> null);
+                new IndicesModule(new NamedWriteableRegistry()).getMapperRegistry(), () -> null);
 
         ShardId shardId = new ShardId(index, 0);
         licenseState = mock(SecurityLicenseState.class);

From 568bf49578cc3f951d35e2cebc45fda9b935ac4a Mon Sep 17 00:00:00 2001
From: Areek Zillur <areek.zillur@elasticsearch.com>
Date: Fri, 17 Jun 2016 10:32:28 -0400
Subject: [PATCH 2/2] add rollover to known actions

Original commit: elastic/x-pack-elasticsearch@296e4ea4c21fe076b834ad40c6898545c09549b4
---
 .../src/test/resources/org/elasticsearch/transport/actions       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/elasticsearch/x-pack/shield/src/test/resources/org/elasticsearch/transport/actions b/elasticsearch/x-pack/shield/src/test/resources/org/elasticsearch/transport/actions
index 1952eec4478..a96611f6b02 100644
--- a/elasticsearch/x-pack/shield/src/test/resources/org/elasticsearch/transport/actions
+++ b/elasticsearch/x-pack/shield/src/test/resources/org/elasticsearch/transport/actions
@@ -44,6 +44,7 @@ indices:admin/refresh
 indices:admin/settings/update
 indices:admin/shards/search_shards
 indices:admin/shrink
+indices:admin/rollover
 indices:admin/template/delete
 indices:admin/template/get
 indices:admin/template/put