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/07/09 22:08:29 UTC

svn commit: r1144730 - /cassandra/trunk/CHANGES.txt

Author: jbellis
Date: Sat Jul  9 20:08:29 2011
New Revision: 1144730

URL: http://svn.apache.org/viewvc?rev=1144730&view=rev
Log:
fix merge conflict

Modified:
    cassandra/trunk/CHANGES.txt

Modified: cassandra/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1144730&r1=1144729&r2=1144730&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Sat Jul  9 20:08:29 2011
@@ -31,7 +31,6 @@
  * fix CLI perpetuating obsolete KsDef.replication_factor (CASSANDRA-2846)
  * improve cli treatment of multiline comments (CASSANDRA-2852)
  * handle row tombstones correctly in EchoedRow (CASSANDRA-2786)
-<<<<<<< .working
  * add MessagingService.get[Recently]DroppedMessages and
    StorageService.getExceptionCount (CASSANDRA-2804)
  * fix possibility of spurious UnavailableException for LOCAL_QUORUM
@@ -39,10 +38,6 @@
  * add ant-optional as dependence for the debian package (CASSANDRA-2164)
  * add option to specify limit for get_slice in the CLI (CASSANDRA-2646)
  * decrease HH page size (CASSANDRA-2832)
-=======
- * add MessagingService.get[Recently]DroppedMessages and
-   StorageService.getExceptionCount (CASSANDRA-2804)
->>>>>>> .merge-right.r1143437
 
 
 0.8.1