Revision 1053698

Jump to revision:
Author:	jbellis
Date:	Wed Dec 29 18:30:12 2010 UTC (13 years, 3 months ago)
Changed paths:	11
Log Message:	merge r1053481, r1053643, r1053682 from 0.7

Changed paths

Path	Details
cassandra/branches/cassandra-0.7.0/	modified , props changed
cassandra/branches/cassandra-0.7.0/CHANGES.txt	modified , text changed
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java	modified , props changed
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java	modified , props changed
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java	modified , props changed
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java	modified , props changed
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java	modified , props changed
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java	modified , text changed
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/CompactionManager.java	modified , text changed
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Table.java	modified , text changed
cassandra/branches/cassandra-0.7.0/test/unit/org/apache/cassandra/db/marshal/TypeValidationTest.java (Copied from cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/db/marshal/TypeValidationTest.java, r1053643)	added