Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EEF50186CD for ; Wed, 2 Dec 2015 13:22:56 +0000 (UTC) Received: (qmail 41486 invoked by uid 500); 2 Dec 2015 13:22:55 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 41376 invoked by uid 500); 2 Dec 2015 13:22:55 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 40703 invoked by uid 99); 2 Dec 2015 13:22:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2015 13:22:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 19780E60D0; Wed, 2 Dec 2015 13:22:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: samt@apache.org To: commits@cassandra.apache.org Date: Wed, 02 Dec 2015 13:23:02 -0000 Message-Id: In-Reply-To: <8a67df91f81643448d88ca0b6d33727b@git.apache.org> References: <8a67df91f81643448d88ca0b6d33727b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29ed6fe2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29ed6fe2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29ed6fe2 Branch: refs/heads/cassandra-3.1 Commit: 29ed6fe2ed214b4415ae8d1581579757d44b89c4 Parents: 9f19dd4 5175326 Author: Sam Tunnicliffe Authored: Wed Dec 2 13:11:53 2015 +0000 Committer: Sam Tunnicliffe Committed: Wed Dec 2 13:14:53 2015 +0000 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 21 +++++++++++++++----- .../cassandra/locator/PropertyFileSnitch.java | 7 ++----- .../cassandra/service/MigrationManager.java | 4 ++-- .../apache/cassandra/service/StorageProxy.java | 8 ++++---- .../cassandra/service/StorageService.java | 12 +++++------ 5 files changed, 30 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ed6fe2/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ed6fe2/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/locator/PropertyFileSnitch.java index 8843b77,dc9a3b8..bfd8e8e --- a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java +++ b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java @@@ -32,8 -31,7 +31,6 @@@ import org.slf4j.Logger import org.slf4j.LoggerFactory; import org.apache.cassandra.exceptions.ConfigurationException; - import org.apache.cassandra.gms.Gossiper; --import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.ResourceWatcher; http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ed6fe2/src/java/org/apache/cassandra/service/MigrationManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ed6fe2/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ed6fe2/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------