Revision 1102339

Jump to revision:
Author:	slebresne
Date:	Thu May 12 15:09:43 2011 UTC (12 years, 11 months ago)
Changed paths:	10
Log Message:	merge from 0.7

Changed paths

Path	Details
cassandra/branches/cassandra-0.8/	modified , props changed
cassandra/branches/cassandra-0.8/CHANGES.txt	modified , text changed
cassandra/branches/cassandra-0.8/contrib/	modified , props changed
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java	modified , props changed
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java	modified , props changed
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java	modified , props changed
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java	modified , props changed
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java	modified , props changed
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java	modified , text changed
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java	modified , text changed