From d1675ba0e7c8aca57d7e3478037ccb640afcb90e Mon Sep 17 00:00:00 2001
From: Sylvain Lebresne <slebresne@apache.org>
Date: Thu, 28 Apr 2011 09:52:57 +0000
Subject: [PATCH] merge from 0.8

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1097388 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 16d740624f..5c9b5fadfc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,7 @@
  * fix nodetool setcompactionthroughput (CASSANDRA-2550)
  * move	gossip heartbeat back to its own thread (CASSANDRA-2554)
  * validate cql TRUNCATE columnfamily before truncating (CASSANDRA-2570)
+ * fix batch_mutate for mixed standard-counter mutations (CASSANDRA-2457)
 
 
 0.8.0-beta1