Revision 1051665

Jump to revision:
Author:	jbellis
Date:	Tue Dec 21 21:44:22 2010 UTC (13 years, 4 months ago)
Changed paths:	10
Log Message:	merge from 0.6

Changed paths

Path	Details
cassandra/branches/cassandra-0.7/	modified , props 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
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/ConsistencyChecker.java	modified , text changed
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/ReadResponseResolver.java	modified , text changed
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java	modified , text changed
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/service/ConsistencyLevelTest.java	modified , text changed