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 A3312D705 for ; Fri, 9 Nov 2012 22:55:47 +0000 (UTC) Received: (qmail 38231 invoked by uid 500); 9 Nov 2012 22:55:47 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 38176 invoked by uid 500); 9 Nov 2012 22:55:47 -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 38151 invoked by uid 99); 9 Nov 2012 22:55:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Nov 2012 22:55:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EF47A5371E; Fri, 9 Nov 2012 22:55:46 +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 X-Mailer: ASF-Git Admin Mailer Subject: [1/7] git commit: Merge branch 'cassandra-1.2' into trunk Message-Id: <20121109225546.EF47A5371E@tyr.zones.apache.org> Date: Fri, 9 Nov 2012 22:55:46 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.2 f5e3ae67c -> dda7aee34 refs/heads/cassandra-1.2.0 f5e3ae67c -> dda7aee34 refs/heads/trunk 880188384 -> fa8550f35 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa8550f3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa8550f3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa8550f3 Branch: refs/heads/trunk Commit: fa8550f35552f16f4c268f7f39c63899f766ca35 Parents: 8801883 dda7aee Author: Jonathan Ellis Authored: Fri Nov 9 16:55:39 2012 -0600 Committer: Jonathan Ellis Committed: Fri Nov 9 16:55:39 2012 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) ----------------------------------------------------------------------