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/92242d78 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92242d78 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92242d78 Branch: refs/heads/trunk Commit: 92242d782fdb583cf4e281bc1cd1f163de783b44 Parents: b24076d a7125d2 Author: Sylvain Lebresne <[email protected]> Authored: Tue Feb 2 14:20:43 2016 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Feb 2 14:20:43 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../io/sstable/metadata/MetadataCollector.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/92242d78/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/92242d78/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java ----------------------------------------------------------------------
