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/04ee4ccb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04ee4ccb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04ee4ccb Branch: refs/heads/trunk Commit: 04ee4ccb905d273bd4f5f7185491f9cedf4d3f55 Parents: 3f1a3b2 cac7364 Author: Paulo Motta <[email protected]> Authored: Wed Jan 4 00:25:23 2017 -0200 Committer: Paulo Motta <[email protected]> Committed: Wed Jan 4 00:25:23 2017 -0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Keyspace.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
