Revision 1053691

Jump to revision:
Author:	jbellis
Date:	Wed Dec 29 18:14:53 2010 UTC (13 years, 3 months ago)
Changed paths:	14
Log Message:	merge r1052002, r1052021, r1052027, r1052355 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/CliMain.java	modified , text changed
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ReadResponse.java	modified , text changed
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ReadVerbHandler.java	modified , text changed
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/StorageProxy.java	modified , text changed
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/StorageProxyMBean.java	modified , text changed
cassandra/branches/cassandra-0.7.0/test/unit/org/apache/cassandra/cli/CliTest.java	modified , text changed