From d4bda829163d11d1e29eefef4f276ef7d5748530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= <xavier@metamarkets.com>
Date: Wed, 26 Nov 2014 11:03:47 -0800
Subject: [PATCH 1/3] remove unused imports

---
 .../src/main/java/io/druid/client/CachingClusteredClient.java  | 3 ---
 server/src/main/java/io/druid/server/QueryResource.java        | 2 --
 2 files changed, 5 deletions(-)

diff --git a/server/src/main/java/io/druid/client/CachingClusteredClient.java b/server/src/main/java/io/druid/client/CachingClusteredClient.java
index 45b0ca0c25d..a70a04726e4 100644
--- a/server/src/main/java/io/druid/client/CachingClusteredClient.java
+++ b/server/src/main/java/io/druid/client/CachingClusteredClient.java
@@ -25,7 +25,6 @@ import com.google.common.base.Function;
 import com.google.common.base.Supplier;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -45,7 +44,6 @@ import io.druid.client.cache.Cache;
 import io.druid.client.cache.CacheConfig;
 import io.druid.client.selector.QueryableDruidServer;
 import io.druid.client.selector.ServerSelector;
-import io.druid.common.utils.JodaUtils;
 import io.druid.guice.annotations.Smile;
 import io.druid.query.BySegmentResultValueClass;
 import io.druid.query.CacheStrategy;
@@ -62,7 +60,6 @@ import io.druid.timeline.DataSegment;
 import io.druid.timeline.TimelineObjectHolder;
 import io.druid.timeline.VersionedIntervalTimeline;
 import io.druid.timeline.partition.PartitionChunk;
-import org.joda.time.DateTime;
 import org.joda.time.Interval;
 
 import java.io.IOException;
diff --git a/server/src/main/java/io/druid/server/QueryResource.java b/server/src/main/java/io/druid/server/QueryResource.java
index 6075d628db9..dbd788e1ebc 100644
--- a/server/src/main/java/io/druid/server/QueryResource.java
+++ b/server/src/main/java/io/druid/server/QueryResource.java
@@ -40,7 +40,6 @@ import io.druid.query.Query;
 import io.druid.query.QueryInterruptedException;
 import io.druid.query.QueryMetricUtil;
 import io.druid.query.QuerySegmentWalker;
-import io.druid.query.RetryQueryRunner;
 import io.druid.server.initialization.ServerConfig;
 import io.druid.server.log.RequestLogger;
 import org.joda.time.DateTime;
@@ -59,7 +58,6 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.StreamingOutput;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 

From 523f9c53cd69f6f98c688c9b452fc22a8b0900db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= <xavier@metamarkets.com>
Date: Wed, 26 Nov 2014 11:03:57 -0800
Subject: [PATCH 2/3] update curator and fix test

curator is more strict now
---
 pom.xml                                                         | 2 +-
 .../java/io/druid/server/bridge/DruidClusterBridgeTest.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 387b23bf8e8..0eb2697aad2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <metamx.java-util.version>0.26.9</metamx.java-util.version>
-        <apache.curator.version>2.6.0</apache.curator.version>
+        <apache.curator.version>2.7.0</apache.curator.version>
         <druid.api.version>0.3.0</druid.api.version>
     </properties>
 
diff --git a/server/src/test/java/io/druid/server/bridge/DruidClusterBridgeTest.java b/server/src/test/java/io/druid/server/bridge/DruidClusterBridgeTest.java
index 27f41493536..657d64f2d0f 100644
--- a/server/src/test/java/io/druid/server/bridge/DruidClusterBridgeTest.java
+++ b/server/src/test/java/io/druid/server/bridge/DruidClusterBridgeTest.java
@@ -129,7 +129,7 @@ public class DruidClusterBridgeTest
         8080
     );
 
-    AtomicReference<LeaderLatch> leaderLatch = new AtomicReference<>(new LeaderLatch(localCf, "test"));
+    AtomicReference<LeaderLatch> leaderLatch = new AtomicReference<>(new LeaderLatch(localCf, "/test"));
 
     ZkPathsConfig zkPathsConfig = new ZkPathsConfig()
     {

From 35a34522500441915ed3e2fbc81a78bf5be637e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= <xavier@metamarkets.com>
Date: Wed, 26 Nov 2014 12:24:40 -0800
Subject: [PATCH 3/3] update jetty

---
 pom.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0eb2697aad2..35fa76c921b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <metamx.java-util.version>0.26.9</metamx.java-util.version>
         <apache.curator.version>2.7.0</apache.curator.version>
+        <jetty.version>9.2.5.v20141112</jetty.version>
         <druid.api.version>0.3.0</druid.api.version>
     </properties>
 
@@ -327,22 +328,22 @@
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-server</artifactId>
-                <version>9.2.3.v20140905</version>
+                <version>${jetty.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-servlet</artifactId>
-                <version>9.2.3.v20140905</version>
+                <version>${jetty.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-servlets</artifactId>
-                <version>9.2.3.v20140905</version>
+                <version>${jetty.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-proxy</artifactId>
-                <version>9.2.3.v20140905</version>
+                <version>${jetty.version}</version>
             </dependency>
             <dependency>
                 <groupId>joda-time</groupId>