Revision 1200473

Jump to revision:
Author:	brandonwilliams
Date:	Thu Nov 10 18:43:20 2011 UTC (12 years, 5 months ago)
Changed paths:	9
Log Message:	Fix CHANGES for 2855 merge.

Changed paths

Path	Details
cassandra/branches/cassandra-1.0/	modified , props changed
cassandra/branches/cassandra-1.0/CHANGES.txt	modified , text changed
cassandra/branches/cassandra-1.0/contrib/	modified , props changed
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java	modified , props changed
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java	modified , props changed
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java	modified , props changed
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java	modified , props changed
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java	modified , props changed
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java	modified , text changed