Revision 1053696

Jump to revision:
Author:	jbellis
Date:	Wed Dec 29 18:26:43 2010 UTC (13 years, 4 months ago)
Changed paths:	22
Log Message:	merge r1053245, r1053247, r1053409 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/cli/CliClient.java	modified , text changed
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliOptions.java	modified , text changed
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliSessionState.java	modified , text 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/ColumnFamilyStoreMBean.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/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java	modified , text changed
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java	modified , text changed
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/AsyncResult.java	modified , text changed
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/IAsyncCallback.java	modified , text changed
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/IAsyncResult.java	modified , text changed
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/IMessageCallback.java (Copied from cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/net/IMessageCallback.java, r1053245)	added
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/MessagingService.java	modified , text changed
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/ResponseVerbHandler.java	modified , text changed
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/utils/ExpiringMap.java	modified , text changed