Revision 1033046

Jump to revision:
Author:	jbellis
Date:	Tue Nov 9 15:58:26 2010 UTC (14 years ago)
Changed paths:	13
Log Message:	merge from 0.6

Changed paths

Path	Details
cassandra/branches/cassandra-0.7/	modified , props changed
cassandra/branches/cassandra-0.7/CHANGES.txt	modified , text changed
cassandra/branches/cassandra-0.7/bin/cassandra-cli.bat	modified , text changed
cassandra/branches/cassandra-0.7/bin/cassandra.bat	modified , text changed
cassandra/branches/cassandra-0.7/bin/json2sstable	modified , text changed
cassandra/branches/cassandra-0.7/bin/json2sstable.bat	modified , text changed
cassandra/branches/cassandra-0.7/bin/nodetool.bat	modified , text changed
cassandra/branches/cassandra-0.7/bin/sstable2json.bat	modified , text changed
cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java	modified , props changed
cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java	modified , props changed
cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java	modified , props changed
cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java	modified , props changed
cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java	modified , props changed