Browse files

Merge branch 'master' into consolidated_jobs

  • Loading branch information...
2 parents 96b825d + 46778b8 commit 30624f3826bdf389d618abfb5f3fc5e4086466c2 @freels freels committed Aug 30, 2011
View
2 .gitignore
@@ -12,3 +12,5 @@ project/boot/
project/plugins/project/
ignore/
flockdb.tmproj
+*.iml
+.idea/
View
2 project/build.properties
@@ -3,6 +3,6 @@
project.organization=com.twitter
project.name=flockdb
sbt.version=0.7.4
-project.version=1.8.0-alpha5
+project.version=1.8.0-alpha6
build.scala.versions=2.8.1
project.initialize=false
View
2 project/build/FlockDBProject.scala
@@ -10,7 +10,7 @@ with SubversionPublisher {
override def filterScalaJars = false
val scalaTools = "org.scala-lang" % "scala-compiler" % "2.8.1"
- val gizzard = "com.twitter" % "gizzard" % "3.0.0-beta4"
+ val gizzard = "com.twitter" % "gizzard" % "3.0.0-beta6"
val asm = "asm" % "asm" % "1.5.3" % "test"
val cglib = "cglib" % "cglib" % "2.2" % "test"
View
1 src/main/scala/com/twitter/flockdb/FlockDB.scala
@@ -45,6 +45,7 @@ class FlockDB(config: FlockDBConfig) extends GizzardServer(config) with Service
Stats.addMetric(name, duration.inMillis.toInt)
rv
}
+ override def addGauge(name: String)(gauge: => Double) { Stats.addGauge(name)(gauge) }
}
val jobPriorities = List(Priority.Low, Priority.Medium, Priority.High).map(_.id)

0 comments on commit 30624f3

Please sign in to comment.