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 2ED3AE6C5 for ; Wed, 6 Mar 2013 22:25:45 +0000 (UTC) Received: (qmail 82926 invoked by uid 500); 6 Mar 2013 22:25:42 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 82842 invoked by uid 500); 6 Mar 2013 22:25:42 -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 82460 invoked by uid 99); 6 Mar 2013 22:25: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; Wed, 06 Mar 2013 22:25:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A9E46830F31; Wed, 6 Mar 2013 22:25:41 +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: [5/17] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2 Message-Id: <20130306222541.A9E46830F31@tyr.zones.apache.org> Date: Wed, 6 Mar 2013 22:25:41 +0000 (UTC) Merge branch 'cassandra-1.1' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8517539e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8517539e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8517539e Branch: refs/heads/cassandra-1.2 Commit: 8517539e51662565946c54dd1865ec41c686e9ed Parents: 62b1ee4 bf8c1ce Author: Brandon Williams Authored: Wed Mar 6 16:16:52 2013 -0600 Committer: Brandon Williams Committed: Wed Mar 6 16:16:52 2013 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------