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/6f97804c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f97804c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f97804c Branch: refs/heads/trunk Commit: 6f97804ceb77669f973c79aab8e7ff36a01307c7 Parents: fcc19a1 01cb787 Author: Benjamin Lerer <b.le...@gmail.com> Authored: Fri Dec 16 12:48:25 2016 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Fri Dec 16 12:48:40 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/LegacyLayout.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f97804c/CHANGES.txt ----------------------------------------------------------------------
