cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stefa...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Date Mon, 13 Feb 2017 11:04:48 GMT
Merge branch 'cassandra-3.11' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ffc82b1e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffc82b1e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ffc82b1e

Branch: refs/heads/trunk
Commit: ffc82b1ee495fcf068730d0d3c12f54afdf517a2
Parents: 1eaef3f 01b91cc
Author: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Authored: Mon Feb 13 11:02:17 2017 +0000
Committer: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Committed: Mon Feb 13 11:02:17 2017 +0000

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/service/StartupChecks.java | 50 ++++++++++++++++++++
 .../org/apache/cassandra/utils/FBUtilities.java |  1 +
 .../cassandra/service/StartupChecksTest.java    |  7 +++
 4 files changed, 59 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffc82b1e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7c38295,67c45e8..39f9513
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -37,7 -7,7 +37,8 @@@
   * More fixes to the TokenAllocator (CASSANDRA-12990)
   * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
  Merged from 3.0:
+  * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Obfuscate password in stress-graphs (CASSANDRA-12233)
   * Hint related logging should include the IP address of the destination in addition to
     host ID (CASSANDRA-13205)
   * Reloading logback.xml does not work (CASSANDRA-13173)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffc82b1e/src/java/org/apache/cassandra/service/StartupChecks.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StartupChecks.java
index 0458820,2774931..b519350
--- a/src/java/org/apache/cassandra/service/StartupChecks.java
+++ b/src/java/org/apache/cassandra/service/StartupChecks.java
@@@ -29,10 -30,11 +30,11 @@@ import com.google.common.collect.Iterab
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
 -import org.apache.cassandra.config.CFMetaData;
 +import org.apache.cassandra.schema.TableMetadata;
+ import org.apache.cassandra.config.Config;
  import org.apache.cassandra.config.DatabaseDescriptor;
 -import org.apache.cassandra.config.Schema;
 -import org.apache.cassandra.config.SchemaConstants;
 +import org.apache.cassandra.schema.Schema;
 +import org.apache.cassandra.schema.SchemaConstants;
  import org.apache.cassandra.db.ColumnFamilyStore;
  import org.apache.cassandra.db.Directories;
  import org.apache.cassandra.db.SystemKeyspace;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffc82b1e/test/unit/org/apache/cassandra/service/StartupChecksTest.java
----------------------------------------------------------------------


Mime
View raw message