Merge branch cassandra-3.0 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a4226f0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a4226f0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a4226f0 Branch: refs/heads/trunk Commit: 7a4226f0cf35c14cdbb209988a15407ca004a4d8 Parents: 7357ed0 507ed14 Author: blerer <[email protected]> Authored: Fri Aug 14 18:08:54 2015 +0200 Committer: blerer <[email protected]> Committed: Fri Aug 14 18:09:06 2015 +0200 ---------------------------------------------------------------------- .../org/apache/cassandra/config/CFMetaData.java | 6 ++ .../apache/cassandra/schema/SchemaKeyspace.java | 39 +++++++------ .../apache/cassandra/schema/TableParams.java | 25 ++++++-- .../cassandra/schema/SchemaKeyspaceTest.java | 60 +++++++++++++++++--- 4 files changed, 103 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
