Merge branch 'tmp' into develop

twitter-archive · Nov 18, 2014 · cf50f28 · cf50f28
2 parents 2663177 + 929ba8c
commit cf50f28
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 81 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,9 @@
+9.6.3
+-----
+release: 30 October 2014
+
+- bump util to 6.22.2-SNAPSHOT
+
 9.6.1
 -----
 release: 24 October 2014

diff --git a/pom.xml b/pom.xml
diff --git a/project/Build.scala b/project/Build.scala
@@ -3,8 +3,8 @@ import Keys._
 import Tests._
 
 object Ostrich extends Build {
-  val libVersion = "9.6.1"
-  val utilVersion = "6.22.1"
+  val libVersion = "9.6.3"
+  val utilVersion = "6.22.2"
 
   val sharedSettings = Seq(
     name := "ostrich",

diff --git a/src/test/scala/com/twitter/ostrich/stats/HistogramSpec.scala b/src/test/scala/com/twitter/ostrich/stats/HistogramSpec.scala
@@ -170,7 +170,7 @@ class HistogramSpec extends SpecificationWithJUnit {
 
     "maximum" in {
       histogram.add(95)
-      histogram.minimum mustEqual 95
+      histogram.maximum mustEqual 95
     }
 
     "maximum with no values" in {
@@ -211,7 +211,7 @@ class HistogramSpec extends SpecificationWithJUnit {
       histogram.getPercentile(0.1) must beGreaterThan(0)
     }
 
-    "Substracting two histograms must never have negative count" in {
+    "Subtracting two histograms must never have negative count" in {
       histogram.add(1)
       histogram2.add(1)
       histogram2.add(10)
@@ -221,7 +221,7 @@ class HistogramSpec extends SpecificationWithJUnit {
       h.getPercentile(0.9999) mustEqual 0
     }
 
-    "Substracting two histograms must work" in {
+    "Subtracting two histograms must work" in {
       val n = 10
       (1 to 2*n) foreach { i => histogram.add(i) }
       (1 to n) foreach { i => histogram2.add(i) }