Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55adebe6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55adebe6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55adebe6 Branch: refs/heads/trunk Commit: 55adebe665e6e1ce7f40d2cefde48b5b167b8394 Parents: ee0b743 30e154d Author: Jason Brown <jasedbr...@gmail.com> Authored: Tue Dec 13 05:10:23 2016 -0800 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Tue Dec 13 05:11:29 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/sstable/metadata/MetadataCollector.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/55adebe6/CHANGES.txt ----------------------------------------------------------------------
