Revision 924050

Jump to revision:
Author:	jbellis
Date:	Tue Mar 16 23:34:16 2010 UTC (14 years, 8 months ago)
Changed paths:	12
Log Message:	merge from 0.6

Changed paths

Path	Details
cassandra/trunk/	modified , props changed
cassandra/trunk/CHANGES.txt	modified , text changed
cassandra/trunk/bin/cassandra.bat	modified , text changed
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java	modified , props changed
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java	modified , props changed
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java	modified , props changed
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java	modified , props changed
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java	modified , props changed
cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java	modified , text changed