Updated Branches: refs/heads/trunk 300b02633 -> ca00f622a
nope 6522 was not merged from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21036468 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21036468 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21036468 Branch: refs/heads/trunk Commit: 21036468c5304a5aac45a0f4f7db2580e4c91e24 Parents: 933df01 Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Feb 6 18:05:39 2014 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Feb 6 18:05:39 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/21036468/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 8148083..ceb25c3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,11 +3,11 @@ * Improve nodetool cfhistograms formatting (CASSANDRA-6360) * Expose bulk loading progress over JMX (CASSANDRA-4757) * Correctly handle null with IF conditions and TTL (CASSANDRA-6623) + * Account for range/row tombstones in tombstone drop + time histogram (CASSANDRA-6522) Merged from 1.2: * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645) * Fix partition and range deletes not triggering flush (CASSANDRA-6655) - * Account for range/row tombstones in tombstone drop - time histogram (CASSANDRA-6522) 2.0.5 * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609)