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 8E046E295 for ; Mon, 11 Feb 2013 19:05:58 +0000 (UTC) Received: (qmail 83637 invoked by uid 500); 11 Feb 2013 19:05:58 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 83607 invoked by uid 500); 11 Feb 2013 19:05:58 -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 83583 invoked by uid 99); 11 Feb 2013 19:05:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Feb 2013 19:05:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0CAEF3CAC9; Mon, 11 Feb 2013 19:05:58 +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: [6/6] git commit: Merge branch 'cassandra-1.2' into trunk Message-Id: <20130211190558.0CAEF3CAC9@tyr.zones.apache.org> Date: Mon, 11 Feb 2013 19:05:58 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.1 310bf3485 -> 577cb2c76 refs/heads/cassandra-1.2 0820b20fb -> 6d3ef440d refs/heads/trunk 4e9d01f50 -> 50b8bf2c1 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/50b8bf2c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50b8bf2c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50b8bf2c Branch: refs/heads/trunk Commit: 50b8bf2c18bb615c11fcf718a557b77901c9f594 Parents: 4e9d01f 6d3ef44 Author: Brandon Williams Authored: Mon Feb 11 13:06:05 2013 -0600 Committer: Brandon Williams Committed: Mon Feb 11 13:06:05 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/HintedHandOffManager.java | 15 ++++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/50b8bf2c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/50b8bf2c/src/java/org/apache/cassandra/db/HintedHandOffManager.java ----------------------------------------------------------------------