Revision 1074329

Jump to revision:
Author:	jbellis
Date:	Thu Feb 24 22:33:03 2011 UTC (13 years, 8 months ago)
Changed paths:	37
Log Message:	merge from 0.7

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/contrib/stress/src/org/apache/cassandra/contrib/stress/Session.java	modified , text changed
cassandra/trunk/contrib/stress/src/org/apache/cassandra/contrib/stress/Stress.java	modified , text changed
cassandra/trunk/contrib/stress/src/org/apache/cassandra/contrib/stress/operations/IndexedRangeSlicer.java	modified , text changed
cassandra/trunk/contrib/stress/src/org/apache/cassandra/contrib/stress/operations/Inserter.java	modified , text changed
cassandra/trunk/contrib/stress/src/org/apache/cassandra/contrib/stress/operations/MultiGetter.java	modified , text changed
cassandra/trunk/contrib/stress/src/org/apache/cassandra/contrib/stress/operations/RangeSlicer.java	modified , text changed
cassandra/trunk/contrib/stress/src/org/apache/cassandra/contrib/stress/operations/Reader.java	modified , text changed
cassandra/trunk/contrib/stress/src/org/apache/cassandra/contrib/stress/util/Operation.java (Copied from cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/util/Operation.java, r1074322)	added
cassandra/trunk/contrib/stress/src/org/apache/cassandra/contrib/stress/util/OperationThread.java	deleted
cassandra/trunk/contrib/stress/src/org/apache/cassandra/contrib/stress/util/Range.java	deleted
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/config/CFMetaData.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/db/BinaryMemtable.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AbstractType.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/IndexHelper.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/io/util/BufferedRandomAccessFile.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableImport.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/utils/EstimatedHistogram.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/utils/LatencyTracker.java	modified , text changed
cassandra/trunk/test/conf/cassandra.yaml	modified , text changed
cassandra/trunk/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java	modified , text changed
cassandra/trunk/test/unit/org/apache/cassandra/utils/EstimatedHistogramTest.java	modified , text changed