Revision 1137777

Jump to revision:
Author:	jbellis
Date:	Mon Jun 20 20:54:24 2011 UTC (13 years, 4 months ago)
Changed paths:	39
Log Message:	merge from 0.8

Changed paths

Path	Details
cassandra/trunk/	modified , props changed
cassandra/trunk/CHANGES.txt	modified , text changed
cassandra/trunk/NEWS.txt	modified , text changed
cassandra/trunk/bin/cassandra.bat	modified , text changed
cassandra/trunk/build.xml	modified , text changed
cassandra/trunk/contrib/	modified , props changed
cassandra/trunk/debian/changelog	modified , text changed
cassandra/trunk/debian/rules	modified , text changed
cassandra/trunk/examples/hadoop_word_count/src/WordCount.java	modified , text 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/src/java/org/apache/cassandra/cache/InstrumentingCache.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/cache/InstrumentingCacheMBean.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/cql/Cql.g	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/cql/Term.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/db/EchoedRow.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLogHeader.java	deleted
cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/ReplayPosition.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionManager.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/BooleanType.java (Copied from cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/marshal/BooleanType.java, r1137774)	added
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/DateType.java (Copied from cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/marshal/DateType.java, r1137774)	added
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/DoubleType.java (Copied from cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/marshal/DoubleType.java, r1137774)	added
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/FloatType.java (Copied from cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/marshal/FloatType.java, r1137774)	added
cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/io/util/FileUtils.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInSession.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOut.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/SSTableExport.java	modified , text changed
cassandra/trunk/test/system/test_cql.py	modified , text changed
cassandra/trunk/test/unit/org/apache/cassandra/SchemaLoader.java	modified , text changed
cassandra/trunk/test/unit/org/apache/cassandra/locator/EC2SnitchTest.java	modified , text changed
cassandra/trunk/test/unit/org/apache/cassandra/tools/SSTableExportTest.java	modified , text changed