Revision 1097449

Jump to revision:
Author:	jbellis
Date:	Thu Apr 28 13:26:28 2011 UTC (12 years, 11 months ago)
Changed paths:	15
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/service/AbstractRowResolver.java	modified , text changed
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AsyncRepairCallback.java	modified , text changed
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/DatacenterReadCallback.java	modified , text changed
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/IResponseResolver.java	modified , text changed
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java	modified , text changed
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/ReadCallback.java	modified , text changed
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/RepairCallback.java	modified , text changed