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/be1efd28 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be1efd28 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be1efd28 Branch: refs/heads/trunk Commit: be1efd28392fe9a4cc28be8d91eb6a685651a8f8 Parents: 92242d7 8996b64 Author: Sylvain Lebresne <[email protected]> Authored: Tue Feb 2 14:23:07 2016 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Feb 2 14:23:07 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/io/sstable/metadata/MetadataCollector.java | 7 ++----- .../org/apache/cassandra/db/compaction/TTLExpiryTest.java | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be1efd28/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be1efd28/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java ----------------------------------------------------------------------
