Revision 1094820

Jump to revision:
Author:	jbellis
Date:	Tue Apr 19 00:04:22 2011 UTC (13 years ago)
Changed paths:	10
Log Message:	merge from 0.7

Changed paths

Path	Details
cassandra/branches/cassandra-0.8/	modified , props 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/tools/stress/src/org/apache/cassandra/stress/Session.java	modified , text changed
cassandra/branches/cassandra-0.8/tools/stress/src/org/apache/cassandra/stress/operations/IndexedRangeSlicer.java	modified , text changed
cassandra/branches/cassandra-0.8/tools/stress/src/org/apache/cassandra/stress/util/Operation.java	modified , text changed