Permalink
Browse files

Merge branch 'tmp'

  • Loading branch information...
2 parents 68e5cb4 + 28c5e54 commit c077afb42742c5de57d7cd353d8983f93cd4f303 Jenkins (CI) committed Jan 30, 2013
Showing with 21 additions and 14 deletions.
  1. +12 −8 build.sbt
  2. +5 −5 pom.xml
  3. +4 −1 src/main/scala/com/twitter/ostrich/stats/Distribution.scala
View
@@ -1,10 +1,10 @@
name := "ostrich"
-version := "9.0.6"
+version := "9.1.0"
organization := "com.twitter"
-scalaVersion := "2.9.2"
+crossScalaVersions := Seq("2.9.2", "2.10.0")
javacOptions ++= Seq("-source", "1.6", "-target", "1.6")
@@ -15,15 +15,19 @@ parallelExecution in Test := false
resolvers += "twitter repo" at "http://maven.twttr.com"
libraryDependencies ++= Seq(
- "com.twitter" %% "util-core" % "6.0.6",
- "com.twitter" %% "util-eval" % "6.0.6",
- "com.twitter" %% "util-logging" % "6.0.6",
- "com.twitter" %% "util-jvm" % "6.0.6",
- "com.twitter" % "scala-json" % "3.0.1"
+ "com.twitter" %% "util-core" % "6.1.0",
+ "com.twitter" %% "util-eval" % "6.1.0",
+ "com.twitter" %% "util-logging" % "6.1.0",
+ "com.twitter" %% "util-jvm" % "6.1.0",
+ "com.twitter" %% "scala-json" % "3.0.1"
)
libraryDependencies ++= Seq(
- "org.scala-tools.testing" % "specs_2.9.1" % "1.6.9" % "test",
+ "org.scala-tools.testing" %% "specs" % "1.6.9" % "test" cross CrossVersion.binaryMapped {
+ case "2.9.2" => "2.9.1"
+ case "2.10.0" => "2.10"
+ case x => x
+ },
"junit" % "junit" % "4.8.1" % "test",
"cglib" % "cglib" % "2.1_3" % "test",
"asm" % "asm" % "1.5.3" % "test",
View
10 pom.xml
@@ -4,7 +4,7 @@
<groupId>com.twitter</groupId>
<artifactId>ostrich</artifactId>
<packaging>jar</packaging>
- <version>9.0.6-SNAPSHOT</version>
+ <version>9.1.0-SNAPSHOT</version>
<parent>
<groupId>com.twitter</groupId>
<artifactId>scala-parent-292</artifactId>
@@ -55,22 +55,22 @@
<dependency>
<groupId>com.twitter</groupId>
<artifactId>util-core</artifactId>
- <version>6.0.7-SNAPSHOT</version>
+ <version>6.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.twitter</groupId>
<artifactId>util-eval</artifactId>
- <version>6.0.7-SNAPSHOT</version>
+ <version>6.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.twitter</groupId>
<artifactId>util-logging</artifactId>
- <version>6.0.7-SNAPSHOT</version>
+ <version>6.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.twitter</groupId>
<artifactId>util-jvm</artifactId>
- <version>6.0.7-SNAPSHOT</version>
+ <version>6.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
@@ -33,7 +33,10 @@ extends JsonSerializable {
def sum = histogram.sum
def minimum = histogram.minimum
def maximum = histogram.maximum
- def average = if (histogram.count > 0) histogram.sum / histogram.count else 0.0
+ def average = {
+ val count = histogram.count
+ if (count > 0) histogram.sum / count else 0.0
+ }
def toJson() = Json.build(toMap).toString

0 comments on commit c077afb

Please sign in to comment.