Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/383eb46b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/383eb46b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/383eb46b Branch: refs/heads/trunk Commit: 383eb46b33de0ce6a9f0d493a4fa88f8793a7e02 Parents: e8737fd c7e74f3 Author: Aleksey Yeschenko <[email protected]> Authored: Mon Nov 23 20:24:05 2015 +0000 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Nov 23 20:24:05 2015 +0000 ---------------------------------------------------------------------- .../org/apache/cassandra/schema/KeyspaceParams.java | 5 +++++ .../apache/cassandra/schema/ReplicationParams.java | 15 +++++++++++++++ .../cassandra/schema/LegacySchemaMigratorTest.java | 3 +++ 3 files changed, 23 insertions(+) ----------------------------------------------------------------------
