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

Posted to commits@cassandra.apache.org by sl...@apache.org on 2011/10/01 17:10:42 UTC

svn commit: r1178008 - /cassandra/branches/cassandra-1.0.0/CHANGES.txt

Author: slebresne
Date: Sat Oct  1 15:10:41 2011
New Revision: 1178008

URL: http://svn.apache.org/viewvc?rev=1178008&view=rev
Log:
remove merge marker from changelog

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

Modified: cassandra/branches/cassandra-1.0.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/CHANGES.txt?rev=1178008&r1=1178007&r2=1178008&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0.0/CHANGES.txt Sat Oct  1 15:10:41 2011
@@ -121,9 +121,6 @@
  * make memtable throughput and column count thresholds no-ops (CASSANDRA-2449)
 
 
-=======
-
->>>>>>> .merge-right.r1176712
 0.8.6
  * revert CASSANDRA-2388
  * change TokenRange.endpoints back to listen/broadcast address to match