Revision 1205475

Jump to revision:
Author:	jbellis
Date:	Wed Nov 23 16:18:43 2011 UTC (12 years, 4 months ago)
Changed paths:	15
Log Message:	merge #2786 from 0.8

Changed paths

Path	Details
cassandra/branches/cassandra-1.0/	modified , props changed
cassandra/branches/cassandra-1.0/CHANGES.txt	modified , text changed
cassandra/branches/cassandra-1.0/contrib/	modified , props changed
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java	modified , props changed
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java	modified , props changed
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java	modified , props changed
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java	modified , props changed
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java	modified , props changed
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/EchoedRow.java	modified , text changed
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/CompactionController.java	modified , text changed
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java	modified , text changed
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java	modified , text changed
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java	modified , text changed
cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/SchemaLoader.java	modified , text changed
cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java	modified , text changed