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 2016/01/05 15:18:24 UTC

[6/6] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: 5dc53e98c6f5979e7d0df48095c4912e878f62ea
Parents: 3962149 dbd5ce1
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 5 15:17:55 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 15:17:55 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  4 ++
 .../org/apache/cassandra/db/ReadCommand.java    |  2 +-
 .../db/compaction/CompactionIterator.java       |  6 +--
 .../cassandra/db/partitions/PurgeFunction.java  | 12 ++---
 .../apache/cassandra/db/rows/BufferCell.java    |  2 +-
 .../cassandra/db/compaction/TTLExpiryTest.java  | 47 ++++++++++++++------
 6 files changed, 49 insertions(+), 24 deletions(-)
----------------------------------------------------------------------