Revision 1153190

Jump to revision:
Author:	jbellis
Date:	Tue Aug 2 16:54:38 2011 UTC (12 years, 8 months ago)
Changed paths:	11
Log Message:	merge #2951 from trunk (r1151625, r1152416)

Changed paths

Path	Details
cassandra/branches/cassandra-0.8/	modified , props changed
cassandra/branches/cassandra-0.8/CHANGES.txt	modified , text changed
cassandra/branches/cassandra-0.8/contrib/	modified , props changed
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java	modified , props changed
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java	modified , props changed
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java	modified , props changed
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java	modified , props changed
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java	modified , props changed
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/FreeableMemory.java	modified , text changed
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/SerializingCache.java	modified , text changed
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/cache/CacheProviderTest.java	modified , text changed