Revision 942217

Jump to revision:
Author:	jbellis
Date:	Fri May 7 20:55:33 2010 UTC (14 years ago)
Changed paths:	12
Log Message:	merge from 0.6

Changed paths

Path	Details
cassandra/trunk/	modified , props changed
cassandra/trunk/CHANGES.txt	modified , text changed
cassandra/trunk/README.txt	modified , text changed
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java	modified , props changed
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java	modified , props changed
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java	modified , props changed
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java	modified , props changed
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java	modified , props changed
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java	modified , text changed
cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java	modified , text changed