From be3e60efc8eaf396bdc07c7e6ca9306811fe87db Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Sun, 25 Jan 2015 15:01:45 -0500
Subject: [PATCH] Upgrade to lucene r1654549 snapshot.

Closes #9402.

Squashed commit of the following:

commit 85c71b6478441a73738c81f02257193f9837f3ba
Author: Robert Muir <rmuir@apache.org>
Date:   Sat Jan 24 11:24:36 2015 -0500

    upgrade to lucene r1654549 snapshot
---
 pom.xml                                                       | 4 ++--
 .../merge/scheduler/ConcurrentMergeSchedulerProvider.java     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8f3de4c0463..59309b05719 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <lucene.version>5.1.0</lucene.version>
-        <lucene.maven.version>5.1.0-snapshot-1652032</lucene.maven.version>
+        <lucene.maven.version>5.1.0-snapshot-1654549</lucene.maven.version>
         <tests.jvms>auto</tests.jvms>
         <tests.shuffle>true</tests.shuffle>
         <tests.output>onerror</tests.output>
@@ -54,7 +54,7 @@
         </repository>
         <repository>
             <id>Lucene snapshots</id>
-            <url>https://download.elasticsearch.org/lucenesnapshots/1652032</url>
+            <url>https://download.elasticsearch.org/lucenesnapshots/1654549</url>
         </repository>
     </repositories>
 
diff --git a/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java b/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java
index 5605603ce97..f52827d0866 100644
--- a/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java
+++ b/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java
@@ -162,8 +162,9 @@ public class ConcurrentMergeSchedulerProvider extends MergeSchedulerProvider {
         }
 
         @Override
-        protected void maybeStall(IndexWriter writer) {
+        protected boolean maybeStall(IndexWriter writer) {
             // Don't stall here, because we do our own index throttling (in InternalEngine.IndexThrottle) when merges can't keep up
+            return true;
         }
     }