You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/06/24 07:04:36 UTC

svn commit: r1139155 - /cassandra/branches/cassandra-0.7/CHANGES.txt

Author: jbellis
Date: Fri Jun 24 05:04:36 2011
New Revision: 1139155

URL: http://svn.apache.org/viewvc?rev=1139155&view=rev
Log:
fix CHANGES merging

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1139155&r1=1139154&r2=1139155&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Fri Jun 24 05:04:36 2011
@@ -63,9 +63,6 @@
  * reduce contention on Table.flusherLock (CASSANDRA-1954)
  * try harder to detect failures during streaming, cleaning up temporary
    files more reliably (CASSANDRA-2088)
-
-
-0.6.13
  * shut down server for OOM on a Thrift thread (CASSANDRA-2269)
  * fix tombstone handling in repair and sstable2json (CASSANDRA-2279)
  * preserve version when streaming data from old sstables (CASSANDRA-2283)