merge from 0.8

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1138718 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2011-06-23 02:48:35 +00:00
parent 6ca0f5aa1a
commit 269d14caac
2 changed files with 9 additions and 1 deletions

View File

@ -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

2
debian/changelog vendored
View File

@ -2,7 +2,7 @@ cassandra (0.8.1) unstable; urgency=low
* New release
-- Sylvain Lebresne <slebresne@apache.org> Thu, 16 Jun 2011 09:37:27 +0200
-- Sylvain Lebresne <slebresne@apache.org> Thu, 21 Jun 2011 09:37:27 +0200
cassandra (0.8.0) unstable; urgency=low