Revision 1053764

Jump to revision:
Author:	jbellis
Date:	Wed Dec 29 22:55:10 2010 UTC (13 years, 3 months ago)
Changed paths:	9
Log Message:	merge from 0.6

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/dht/RandomPartitioner.java	modified , text changed
cassandra/branches/cassandra-0.7.0/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java	modified , text changed