Merge remote branch 'origin/master' into upgrade_thrift

Conflicts: build.sh
stevej · Sep 28, 2010 · b15df44 · b15df44
2 parents 622e1d3 + 979ef75
commit b15df44
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build.sh b/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION=0.1.0-thrift-r995939
+VERSION=0.1.1-thrift-0.5.0-rc0
 
 rm -rf gen-java
 
@@ -10,7 +10,7 @@ thrift --gen java src/main/thrift/scribe.thrift
 rm -rf target
 mkdir target
 
-javac -classpath lib/libthrift-0.5.0-instant-r995939.jar:lib/slf4j-api-1.5.8.jar -d target `find gen-java -name \*.java -print`
+javac -classpath lib/libthrift-0.5.0-rc0.jar:lib/slf4j-api-1.5.8.jar -d target `find gen-java -name \*.java -print`
 
 cd target
 jar cvf ../scribe_client-$VERSION.jar *

diff --git a/lib/libthrift-0.4.0.jar b/lib/libthrift-0.4.0.jar