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 9DB4092B5 for ; Fri, 30 Mar 2012 19:33:28 +0000 (UTC) Received: (qmail 36776 invoked by uid 500); 30 Mar 2012 19:33:28 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 36725 invoked by uid 500); 30 Mar 2012 19:33:28 -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 36717 invoked by uid 99); 30 Mar 2012 19:33:28 -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, 30 Mar 2012 19:33:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 24994A437; Fri, 30 Mar 2012 19:33:28 +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/6] git commit: Merge branch 'cassandra-1.1' into trunk Message-Id: <20120330193328.24994A437@tyr.zones.apache.org> Date: Fri, 30 Mar 2012 19:33:28 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.1 a40e162ba -> cd20c3a63 refs/heads/cassandra-1.1.0 41314a21d -> e4e87661d refs/heads/trunk 03c3fec4c -> 760e992ed 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/760e992e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/760e992e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/760e992e Branch: refs/heads/trunk Commit: 760e992ed88fe4dbcb04fe4a4c929b3c5e00dc14 Parents: 03c3fec cd20c3a Author: Brandon Williams Authored: Fri Mar 30 14:33:21 2012 -0500 Committer: Brandon Williams Committed: Fri Mar 30 14:33:21 2012 -0500 ---------------------------------------------------------------------- bin/cqlsh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ----------------------------------------------------------------------