fix merge error; recompile Cassandra.java with thrift 0.7.0

This commit is contained in:
Eric Evans 2012-01-18 10:54:33 -06:00
parent 7c92fc52ec
commit bce44ff329
1 changed files with 4550 additions and 4470 deletions