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 2012/02/08 15:39:45 UTC
[3/6] git commit: Fix changelog
Fix changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21875309
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21875309
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21875309
Branch: refs/heads/trunk
Commit: 21875309558199240bd3399e6e280ea8198b3c0d
Parents: 6cb4af7
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 8 15:21:51 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 8 15:21:51 2012 +0100
----------------------------------------------------------------------
CHANGES.txt | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/21875309/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4be81fc..b51e385 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -20,6 +20,7 @@ Merged from 0.8:
case (CASSANDRA-3251)
* fix thread safety issues in commitlog replay, primarily affecting
systems with many (100s) of CF definitions (CASSANDRA-3751)
+ * Fix relevant tomstone ignored with super columns (CASSANDRA-3875)
1.0.7
@@ -89,20 +90,6 @@ Merged from 0.8:
* add back partitioner to sstable metadata (CASSANDRA-3540)
* fix NPE in get_count for counters (CASSANDRA-3601)
Merged from 0.8:
-||||||| merged common ancestors
-
-
-0.8.9
- * avoid logging (harmless) exception when GC takes < 1ms (CASSANDRA-3656)
-=======
- * block on flush before compacting hints (may prevent OOM) (CASSANDRA-3733)
- * (Pig) fix CassandraStorage to use correct comparator in Super ColumnFamily
- case (CASSANDRA-3251)
- * Fix relevant tomstone ignored with super columns (CASSANDRA-3875)
-
-0.8.9
- * avoid logging (harmless) exception when GC takes < 1ms (CASSANDRA-3656)
->>>>>>> cassandra-0.8
* remove invalid assertion that table was opened before dropping it
(CASSANDRA-3580)
* range and index scans now only send requests to enough replicas to