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 CE22310C99 for ; Fri, 12 Apr 2013 17:13:07 +0000 (UTC) Received: (qmail 85274 invoked by uid 500); 12 Apr 2013 17:13:07 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 85216 invoked by uid 500); 12 Apr 2013 17:13:07 -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 85043 invoked by uid 99); 12 Apr 2013 17:13:07 -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, 12 Apr 2013 17:13:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E1C78819A2D; Fri, 12 Apr 2013 17:13:06 +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: Fri, 12 Apr 2013 17:13:11 -0000 Message-Id: <18359a96988645fe9a918289a88a0d92@git.apache.org> In-Reply-To: <590173bb43f944e2847597122bec91fd@git.apache.org> References: <590173bb43f944e2847597122bec91fd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] git commit: Merge branch 'cassandra-1.2' into trunk 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/45400d70 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45400d70 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45400d70 Branch: refs/heads/trunk Commit: 45400d70028fccf699e5f32f6469aaed7db05bc8 Parents: 6b4f2ee ef5390b Author: Brandon Williams Authored: Fri Apr 12 12:12:49 2013 -0500 Committer: Brandon Williams Committed: Fri Apr 12 12:12:49 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------