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 3BB3BD5FD for ; Thu, 14 Feb 2013 04:56:44 +0000 (UTC) Received: (qmail 80662 invoked by uid 500); 14 Feb 2013 04:56:43 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 80445 invoked by uid 500); 14 Feb 2013 04:56:43 -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 80399 invoked by uid 99); 14 Feb 2013 04:56:42 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Feb 2013 04:56:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1B9F232579A; Thu, 14 Feb 2013 04:56:42 +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 X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'cassandra-1.2' into trunk Message-Id: <20130214045642.1B9F232579A@tyr.zones.apache.org> Date: Thu, 14 Feb 2013 04:56:42 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.2 99b3963b7 -> 3925f5606 refs/heads/trunk 59af0b9c4 -> 7242a0054 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/7242a005 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7242a005 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7242a005 Branch: refs/heads/trunk Commit: 7242a0054d6d2499f621d6b128bdc39e7ec97f5c Parents: 59af0b9 3925f56 Author: Brandon Williams Authored: Wed Feb 13 22:56:49 2013 -0600 Committer: Brandon Williams Committed: Wed Feb 13 22:56:49 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/StorageService.java | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7242a005/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7242a005/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------