Merge branch 'master' of github.com:twitter/flockdb

twitter-archive · Sep 26, 2011 · b6cd936 · b6cd936
2 parents e4af1ee + 0b6d8ae
commit b6cd936
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/doc/demo.markdown b/doc/demo.markdown
@@ -1,4 +1,3 @@
-
 # Flock demo
 
 This demo will walk through setting up a local development flockdb instance and interacting with it
@@ -56,7 +55,7 @@ in your `.gizzmorc` to make the rest of the demo easier:
 
     $ cat ~/.gizzmorc
     host: localhost
-    port: 7917
+    port: 7920
 
 Then:
 

diff --git a/project/build.properties b/project/build.properties
@@ -3,6 +3,6 @@
 project.organization=com.twitter
 project.name=flockdb
 sbt.version=0.7.4
-project.version=1.8.0-alpha8
+project.version=1.8.0-alpha11
 build.scala.versions=2.8.1
 project.initialize=false
diff --git a/project/build/FlockDBProject.scala b/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-beta11"
+  val gizzard   = "com.twitter" % "gizzard" % "3.0.0-beta14"
 
   val asm       = "asm"                     % "asm"          % "1.5.3" % "test"
   val cglib     = "cglib"                   % "cglib"        % "2.2"   % "test"