Revision 1165219

Jump to revision:
Author:	slebresne
Date:	Mon Sep 5 09:26:36 2011 UTC (12 years, 7 months ago)
Changed paths:	8
Log Message:	merge from 0.8

Changed paths

Path	Details
cassandra/trunk/	modified , props 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/test/unit/org/apache/cassandra/io/sstable/SSTableSimpleWriterTest.java (Copied from cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/io/sstable/SSTableSimpleWriterTest.java, r1165218)	added