Merge branch 'cassandra-3.0' into trunk
Conflicts:
src/java/org/apache/cassandra/schema/TableParams.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a7985d8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a7985d8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a7985d8
Branch: refs/heads/trunk
Commit: 6a7985d87a794e95c5e17a3aa9d73c5ed42177ff
Parents: 063e917 621d08a
Author: Tyler Hobbs <tylerlho...@gmail.com>
Authored: Tue Jun 21 11:14:09 2016 -0500
Committer: Tyler Hobbs <tylerlho...@gmail.com>
Committed: Tue Jun 21 11:14:09 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../apache/cassandra/schema/TableParams.java | 7 ++-
.../cassandra/utils/BloomCalculations.java | 15 +++++-
.../schema/CreateTableValidationTest.java | 51 ++++++++++++++++++++
4 files changed, 71 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a7985d8/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a7985d8/src/java/org/apache/cassandra/schema/TableParams.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/schema/TableParams.java
index 16b4427,29d3e29..02112af
--- a/src/java/org/apache/cassandra/schema/TableParams.java
+++ b/src/java/org/apache/cassandra/schema/TableParams.java
@@@ -25,7 -25,7 +25,8 @@@ import com.google.common.base.Objects
import com.google.common.collect.ImmutableMap;
import org.apache.cassandra.exceptions.ConfigurationException;
+ import org.apache.cassandra.utils.BloomCalculations;
+
import static java.lang.String.format;
public final class TableParams
