Revision 1037045

Jump to revision:
Author:	jbellis
Date:	Fri Nov 19 21:52:53 2010 UTC (13 years, 5 months ago)
Changed paths:	8
Log Message:	merge from 0.6

Changed paths

Path	Details
cassandra/branches/cassandra-0.7/	modified , props changed
cassandra/branches/cassandra-0.7/CHANGES.txt	modified , text 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/utils/CLibrary.java	modified , text changed