cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mish...@apache.org
Subject [2/6] git commit: Ninja: fixed CHANGES.txt for CASSANDRA-7828
Date Tue, 09 Sep 2014 22:23:54 GMT
Ninja: fixed CHANGES.txt for CASSANDRA-7828


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f0d7802a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0d7802a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0d7802a

Branch: refs/heads/cassandra-2.1
Commit: f0d7802a008d4b1cb4b742c97bf2263379e78dc6
Parents: 8aa3c3a
Author: Mikhail Stepura <mishail@apache.org>
Authored: Tue Sep 9 15:22:35 2014 -0700
Committer: Mikhail Stepura <mishail@apache.org>
Committed: Tue Sep 9 15:22:35 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0d7802a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 747df0d..273fed9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,8 @@
  * Always send Paxos commit to all replicas (CASSANDRA-7479)
  * Make disruptor_thrift_server invocation pool configurable (CASSANDRA-7594)
  * Make repair no-op when RF=1 (CASSANDRA-7864)
+Merged from 1.2:
+ * Don't index tombstones (CASSANDRA-7828)
 
 
 2.0.10
@@ -81,7 +83,6 @@
  * Fix sstableloader unable to connect encrypted node (CASSANDRA-7585)
  * Make StreamReceiveTask thread safe and gc friendly (CASSANDRA-7795)
 Merged from 1.2:
- * Don't index tombstones (CASSANDRA-7828
  * Don't allow compacted sstables to be marked as compacting (CASSANDRA-7145)
  * Track expired tombstones (CASSANDRA-7810)
  * Validate empty cell names from counter updates (CASSANDRA-7798)


Mime
View raw message