You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by st...@apache.org on 2016/07/25 00:47:32 UTC

[16/41] cassandra git commit: update CHANGES

update CHANGES


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

Branch: refs/heads/trunk
Commit: bfa1acd311c909ef88ee8133f9e9f9f2edc0749e
Parents: a5930af
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Jul 21 10:19:47 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Jul 21 10:19:47 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfa1acd3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ffd92b5..f35e0a4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,8 +5,8 @@
  * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143)
  * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
  * MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973)
-Merged from 2.1:
  * Don't write shadowed range tombstone (CASSANDRA-12030)
+Merged from 2.1:
  * Improve digest calculation in the presence of overlapping tombstones (CASSANDRA-11349)
  * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
  * Account for partition deletions in tombstone histogram (CASSANDRA-12112)