Permalink
Browse files

Merge branch 'master' into copy_repair

Conflicts:
	project/build.properties
	src/main/scala/com/twitter/gizzard/scheduler/CopyJob.scala
  • Loading branch information...
2 parents 7e77149 + b114f8c commit 0dcca9f28b0e8789d1883e00b16116a4763d8440 @boazavital boazavital committed Dec 9, 2011
View
2 project/build.properties
@@ -3,6 +3,6 @@
project.organization=com.twitter
project.name=gizzard
sbt.version=0.7.4
-project.version=3.0.0-beta26-SNAPSHOT
+project.version=3.0.0-beta28-SNAPSHOT
build.scala.versions=2.8.1
project.initialize=false
View
13 project/build/GizzardProject.scala
@@ -6,19 +6,22 @@ with CompileThriftFinagle
with DefaultRepos
with SubversionPublisher {
+ def finagleVersion = "1.9.10"
+
override def filterScalaJars = false
val scalaTools = "org.scala-lang" % "scala-compiler" % "2.8.1"
- val querulous = "com.twitter" % "querulous" % "2.5.1"
+ val querulous = "com.twitter" % "querulous" % "2.6.5"
//val kestrel = "net.lag" % "kestrel" % "1.2.7"
// remove when moved to libkestrel
val twitterActors = "com.twitter" % "twitteractors_2.8.0" % "2.0.1"
- val finagleThrift = "com.twitter" % "finagle-thrift" % "1.9.6"
- val finagleOstrich4 = "com.twitter" % "finagle-ostrich4" % "1.9.6"
- val jackson = "org.codehaus.jackson" % "jackson-core-asl" % "1.6.7"
- val jacksonMap = "org.codehaus.jackson" % "jackson-mapper-asl" % "1.6.7"
+ val finagleThrift = "com.twitter" % "finagle-thrift" % "1.9.10"
+ val finagleOstrich4 = "com.twitter" % "finagle-ostrich4" % "1.9.10"
+
+ val jackson = "org.codehaus.jackson" % "jackson-core-asl" % "1.9.2"
+ val jacksonMap = "org.codehaus.jackson" % "jackson-mapper-asl" % "1.9.2"
val slf4j = "org.slf4j" % "slf4j-jdk14" % "1.5.2" //intransitive
val slf4jApi = "org.slf4j" % "slf4j-api" % "1.5.2" //intransitive
View
3 src/main/scala/com/twitter/gizzard/scheduler/CopyJob.scala
@@ -17,7 +17,8 @@ class UnsupportedOperation(msg: String) extends ShardException(msg)
* A factory for creating a new copy job (with default count and a starting cursor) from a source
* and destination shard ID.
*/
-trait CopyJobFactory[T] extends (Seq[ShardId] => CopyJob[T])
+
+trait CopyJobFactory[T] extends (Seq[ShardId] => JsonJob)
class NullCopyJobFactory[T](message: String) extends CopyJobFactory[T] {
def apply(ids: Seq[ShardId]) = throw new UnsupportedOperation(message)
View
2 src/main/scala/com/twitter/gizzard/scheduler/RepairJob.scala
@@ -19,7 +19,7 @@ object RepairJob {
* A factory for creating a new repair job (with default count and a starting cursor) from a source
* and destination shard ID.
*/
-trait RepairJobFactory[T] extends (Seq[ShardId] => RepairJob[T])
+trait RepairJobFactory[T] extends (Seq[ShardId] => JsonJob)
class NullRepairJobFactory[T](message: String) extends RepairJobFactory[T] {
def apply(ids: Seq[ShardId]) = throw new UnsupportedOperation(message)

0 comments on commit 0dcca9f

Please sign in to comment.