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 92ACFE88B for ; Tue, 25 Jun 2013 01:09:15 +0000 (UTC) Received: (qmail 10838 invoked by uid 500); 25 Jun 2013 01:09:15 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 10741 invoked by uid 500); 25 Jun 2013 01:09:15 -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 10726 invoked by uid 99); 25 Jun 2013 01:09:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Jun 2013 01:09:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1AEAD82F7D6; Tue, 25 Jun 2013 01:09:15 +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, 25 Jun 2013 01:09:17 -0000 Message-Id: <7e6401d3484f4064aabc7ea762e74ee9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: merge from 1.2 merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40bc4456 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40bc4456 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40bc4456 Branch: refs/heads/trunk Commit: 40bc4456fa0228e8a78c6f6edab0b02c38c14389 Parents: a684ee0 81619fe Author: Jonathan Ellis Authored: Mon Jun 24 18:09:12 2013 -0700 Committer: Jonathan Ellis Committed: Mon Jun 24 18:09:12 2013 -0700 ---------------------------------------------------------------------- ----------------------------------------------------------------------