Revision 1157379

Jump to revision:
Author:	jbellis
Date:	Sat Aug 13 13:53:27 2011 UTC (13 years, 3 months ago)
Changed paths:	11
Log Message:	merge from 0.8

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/contrib/	modified , props 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/compaction/CompactionController.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java	modified , text changed