Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e8bb3a6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e8bb3a6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e8bb3a6 Branch: refs/heads/trunk Commit: 2e8bb3a6453c423f02825f2496fd54148a14df07 Parents: fa4c173 383eb46 Author: Aleksey Yeschenko <[email protected]> Authored: Mon Nov 23 20:24:33 2015 +0000 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Nov 23 20:24:33 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(+) ----------------------------------------------------------------------
