Permalink
Browse files

Merge git://github.com/johanoskarsson/YCSB into test

Conflicts:
	.gitignore
	build.xml
	db/cassandra-0.6/lib/README
  • Loading branch information...
brianfrankcooper committed May 4, 2010
2 parents 5680787 + f588645 commit 33d28e4fdbeced584226b6f4c0cd9954c5d0870d
View
@@ -2,6 +2,5 @@ build
.classpath
.project
.settings
-db/cassandra-0.5/lib
-db/cassandra-0.6/lib
-db/hbase/lib
+db/*/lib/*
+
View
@@ -18,6 +18,11 @@
<antcall target="dbcompile"/>
</target>
+ <target name="dbcompile-cassandra-0.7" depends="compile">
+ <property name="db.dir" value="db/cassandra-0.7"/>
+ <antcall target="dbcompile"/>
+ </target>
+
<target name="dbcompile-hbase" depends="compile">
<property name="db.dir" value="db/hbase"/>
<antcall target="dbcompile"/>
Oops, something went wrong.

0 comments on commit 33d28e4

Please sign in to comment.