From 269d14caac30f6bb35dceec44840520c8bc557fb Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Thu, 23 Jun 2011 02:48:35 +0000 Subject: [PATCH] merge from 0.8 git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1138718 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 8 ++++++++ debian/changelog | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index e31298da41..671eec5b74 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -81,12 +81,20 @@ * make stress.jar executable (CASSANDRA-2744) * add daemon mode to java stress (CASSANDRA-2267) * expose the DC and rack of a node through JMX and nodetool ring (CASSANDRA-2531) +<<<<<<< .working * fix cache mbean getSize (CASSANDRA-2781) * Add Date, Float, Double, and Boolean types (CASSANDRA-2530) * fix repair hanging if a neighbor has nothing to send (CASSANDRA-2797) * add jamm agent to cassandra.bat (CASSANDRA-2787) * Fix wrong purge of deleted cf during compaction (CASSANDRA-2786) * purge tombstone even if row is in only one sstable (CASSANDRA-2801) +======= + * fix cache mbean getSize (CASSANDRA-2781) + * Add Date, Float, Double, and Boolean types (CASSANDRA-2530) + * Add startup flag to renew counter node id (CASSANDRA-2788) + * add jamm agent to cassandra.bat (CASSANDRA-2787) + * fix repair hanging if a neighbor has nothing to send (CASSANDRA-2797) +>>>>>>> .merge-right.r1137981 0.8.0-final diff --git a/debian/changelog b/debian/changelog index 9bb7f182dc..9bdd0cf1cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ cassandra (0.8.1) unstable; urgency=low * New release - -- Sylvain Lebresne Thu, 16 Jun 2011 09:37:27 +0200 + -- Sylvain Lebresne Thu, 21 Jun 2011 09:37:27 +0200 cassandra (0.8.0) unstable; urgency=low