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 444B4D11D for ; Fri, 26 Oct 2012 13:48:25 +0000 (UTC) Received: (qmail 70299 invoked by uid 500); 26 Oct 2012 13:48:24 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 70161 invoked by uid 500); 26 Oct 2012 13:48:24 -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 70091 invoked by uid 99); 26 Oct 2012 13:48:22 -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, 26 Oct 2012 13:48:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 592CB4FDFE; Fri, 26 Oct 2012 13:48:22 +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: [1/3] git commit: Merge branch 'cassandra-1.1' into trunk Message-Id: <20121026134822.592CB4FDFE@tyr.zones.apache.org> Date: Fri, 26 Oct 2012 13:48:22 +0000 (UTC) Updated Branches: refs/heads/trunk 64f3ab270 -> 213d25c99 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/213d25c9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/213d25c9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/213d25c9 Branch: refs/heads/trunk Commit: 213d25c99c5a197a28be6b41ecf26fe48ae4eece Parents: 3d48671 afd95c1 Author: Brandon Williams Authored: Fri Oct 26 08:48:14 2012 -0500 Committer: Brandon Williams Committed: Fri Oct 26 08:48:14 2012 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------