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 0909E17448 for ; Tue, 14 Apr 2015 19:31:38 +0000 (UTC) Received: (qmail 11723 invoked by uid 500); 14 Apr 2015 19:31:37 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 11622 invoked by uid 500); 14 Apr 2015 19:31:37 -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 11293 invoked by uid 99); 14 Apr 2015 19:31:36 -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; Tue, 14 Apr 2015 19:31:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C0FACE0416; Tue, 14 Apr 2015 19:31:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Tue, 14 Apr 2015 19:31:41 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/10] cassandra git commit: Fix failed bootstrap/replace attempts being persisted in system.peers Fix failed bootstrap/replace attempts being persisted in system.peers Patch by brandonwilliams, reviewed by slebresne for CASSANDRA-9180 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee9bd549 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee9bd549 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee9bd549 Branch: refs/heads/cassandra-2.1 Commit: ee9bd549e83a157ae727f2e38c921694fffda52d Parents: cba1b68 Author: Brandon Williams Authored: Tue Apr 14 12:19:53 2015 -0500 Committer: Jonathan Ellis Committed: Tue Apr 14 12:50:01 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee9bd549/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index b527528..21d5249 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -88,7 +88,7 @@ public class CassandraDaemon } else { - System.setProperty("java.rmi.server.hostname","127.0.0.1"); + System.setProperty("java.rmi.server.hostname", InetAddress.getLoopbackAddress().getHostAddress()); try {