Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49278480 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49278480 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49278480 Branch: refs/heads/trunk Commit: 49278480d9d990e25f8ae7d939e5fd92d87864e8 Parents: bbc3834 f24e066 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Thu May 26 11:37:59 2016 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Thu May 26 11:37:59 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/db/Keyspace.java | 12 +++++------- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/49278480/CHANGES.txt ----------------------------------------------------------------------
