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 C593B17D11 for ; Wed, 15 Apr 2015 15:40:45 +0000 (UTC) Received: (qmail 98332 invoked by uid 500); 15 Apr 2015 15:40:45 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 98231 invoked by uid 500); 15 Apr 2015 15:40:45 -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 97871 invoked by uid 99); 15 Apr 2015 15:40:44 -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, 15 Apr 2015 15:40:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BAB6BE0664; Wed, 15 Apr 2015 15:40:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Wed, 15 Apr 2015 15:40:49 -0000 Message-Id: <2067f9a4f18a4efd9b3e9bfc3c9d58f0@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] cassandra git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/46c3f7d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46c3f7d8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46c3f7d8 Branch: refs/heads/trunk Commit: 46c3f7d875926d10f53cc5d05e3b0a666fda3af4 Parents: f6b424f 3c17ac6 Author: Brandon Williams Authored: Wed Apr 15 10:40:36 2015 -0500 Committer: Brandon Williams Committed: Wed Apr 15 10:40:36 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/46c3f7d8/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------