Merge branch cassandra-3.0 into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95c8aef8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95c8aef8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95c8aef8 Branch: refs/heads/cassandra-3.11 Commit: 95c8aef81c1bb741643445767e39c82da9aec7cb Parents: c000827 5050aa3 Author: Benjamin Lerer <b.le...@gmail.com> Authored: Thu Dec 14 14:57:16 2017 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Thu Dec 14 15:01:18 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/StartupChecks.java | 34 +----- .../org/apache/cassandra/utils/JavaUtils.java | 115 +++++++++++++++++++ .../apache/cassandra/utils/JavaUtilsTest.java | 52 +++++++++ 4 files changed, 171 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95c8aef8/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95c8aef8/src/java/org/apache/cassandra/service/StartupChecks.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StartupChecks.java index 6c309b6,ae44df5..cb10ab4 --- a/src/java/org/apache/cassandra/service/StartupChecks.java +++ b/src/java/org/apache/cassandra/service/StartupChecks.java @@@ -49,9 -47,8 +49,10 @@@ import org.apache.cassandra.exceptions. import org.apache.cassandra.exceptions.StartupException; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.util.FileUtils; -import org.apache.cassandra.schema.SchemaKeyspace; -import org.apache.cassandra.utils.*; +import org.apache.cassandra.utils.NativeLibrary; +import org.apache.cassandra.utils.FBUtilities; ++import org.apache.cassandra.utils.JavaUtils; +import org.apache.cassandra.utils.SigarLibrary; /** * Verifies that the system and environment is in a fit state to be started. --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
