From 45e443bedbe011fa8df463fb2c77a3cd93fd5e4c Mon Sep 17 00:00:00 2001
From: fjy <fangjin@metamarkets.com>
Date: Fri, 25 Jul 2014 16:07:40 -0700
Subject: [PATCH] a few slight tweaks and bumping up curator version

---
 docs/content/Broker-Config.md                            | 2 +-
 pom.xml                                                  | 2 +-
 .../hyperloglog/HyperLogLogCollectorTest.java            | 9 ++++++---
 server/src/main/java/io/druid/server/QueryResource.java  | 1 -
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/content/Broker-Config.md b/docs/content/Broker-Config.md
index 6da606c70e..80eaf4ce40 100644
--- a/docs/content/Broker-Config.md
+++ b/docs/content/Broker-Config.md
@@ -12,10 +12,10 @@ The broker module uses several of the default modules in [Configuration](Configu
 
 |Property|Possible Values|Description|Default|
 |--------|---------------|-----------|-------|
-|`druid.broker.cache.type`|`local`, `memcached`|The type of cache to use for queries.|`local`|
 |`druid.broker.balancer.type`|`random`, `connectionCount`|Determines how the broker balances connections to historical nodes. `random` choose randomly, `connectionCount` picks the node with the fewest number of active connections to|`random`|
 |`druid.broker.select.tier`|`highestPriority`, `lowestPriority`, `custom`|If segments are cross-replicated across tiers in a cluster, you can tell the broker to prefer to select segments in a tier with a certain priority.|`highestPriority`|
 |`druid.broker.select.tier.custom.priorities`|`An array of integer priorities.`|Select servers in tiers with a custom priority list.|None|
+|`druid.broker.cache.type`|`local`, `memcached`|The type of cache to use for queries.|`local`|
 
 
 #### Local Cache
diff --git a/pom.xml b/pom.xml
index cfd8a332b5..8ac7991998 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <metamx.java-util.version>0.26.6</metamx.java-util.version>
-        <apache.curator.version>2.5.0</apache.curator.version>
+        <apache.curator.version>2.6.0</apache.curator.version>
         <druid.api.version>0.2.7</druid.api.version>
     </properties>
 
diff --git a/processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperLogLogCollectorTest.java b/processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperLogLogCollectorTest.java
index dbc06accf2..ddf02efeca 100644
--- a/processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperLogLogCollectorTest.java
+++ b/processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperLogLogCollectorTest.java
@@ -90,7 +90,8 @@ public class HyperLogLogCollectorTest
    * with 100 values, requiring  a floating max as described in
    * http://druid.io/blog/2014/02/18/hyperloglog-optimizations-for-real-world-systems.html
    */
-  @Ignore @Test
+  @Ignore
+  @Test
   public void testHighCardinalityRollingFold() throws Exception
   {
     final HyperLogLogCollector rolling = HyperLogLogCollector.makeLatestCollector();
@@ -130,7 +131,8 @@ public class HyperLogLogCollectorTest
     Assert.assertEquals(n, rolling.estimateCardinality(), n * 0.05);
   }
 
-  @Ignore @Test
+  @Ignore
+  @Test
   public void testHighCardinalityRollingFold2() throws Exception
   {
     final HyperLogLogCollector rolling = HyperLogLogCollector.makeLatestCollector();
@@ -876,7 +878,8 @@ public class HyperLogLogCollectorTest
   }
 
   // Provides a nice printout of error rates as a function of cardinality
-  @Ignore @Test
+  @Ignore
+  @Test
   public void showErrorRate() throws Exception
   {
     HashFunction fn = Hashing.murmur3_128();
diff --git a/server/src/main/java/io/druid/server/QueryResource.java b/server/src/main/java/io/druid/server/QueryResource.java
index 59ebf5b944..aee2fb0ddc 100644
--- a/server/src/main/java/io/druid/server/QueryResource.java
+++ b/server/src/main/java/io/druid/server/QueryResource.java
@@ -148,7 +148,6 @@ public class QueryResource
         );
       }
 
-
       if (log.isDebugEnabled()) {
         log.debug("Got query [%s]", query);
       }
-- 
GitLab