Revision 939110

Jump to revision:
Author:	jbellis
Date:	Wed Apr 28 22:00:46 2010 UTC (14 years ago)
Changed paths:	28
Log Message:	merge from 0.6

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/build.xml	modified , text changed
cassandra/trunk/contrib/word_count/README.txt	modified , text changed
cassandra/trunk/contrib/word_count/bin/word_count	modified , text changed
cassandra/trunk/contrib/word_count/bin/word_count_setup	modified , text changed
cassandra/trunk/contrib/word_count/build.xml	modified , text changed
cassandra/trunk/contrib/word_count/ivy.xml (Copied from cassandra/branches/cassandra-0.6/contrib/word_count/ivy.xml, r939102)	added
cassandra/trunk/contrib/word_count/storage-conf.xml	modified , text changed
cassandra/trunk/debian/changelog	modified , text changed
cassandra/trunk/debian/rules	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/db/Table.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogExecutorService.java (Copied from cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogExecutorService.java, r939102)	added
cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogExecutorService.java (Copied from cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogExecutorService.java, r939102)	added
cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogExecutorServiceMBean.java (Copied from cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogExecutorServiceMBean.java, r939102)	added
cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java	modified , text changed
cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLogExecutorService.java	deleted
cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLogExecutorServiceMBean.java	deleted
cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/ICommitLogExecutorService.java (Copied from cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/commitlog/ICommitLogExecutorService.java, r939102)	added
cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/PeriodicCommitLogExecutorService.java (Copied from cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/commitlog/PeriodicCommitLogExecutorService.java, r939102)	added
cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/PeriodicCommitLogExecutorServiceMBean.java (Copied from cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/commitlog/PeriodicCommitLogExecutorServiceMBean.java, r939102)	added
cassandra/trunk/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java	modified , text changed