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 DA1911116B for ; Thu, 24 Apr 2014 03:10:52 +0000 (UTC) Received: (qmail 78725 invoked by uid 500); 24 Apr 2014 03:10:52 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 78466 invoked by uid 500); 24 Apr 2014 03:10:50 -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 78454 invoked by uid 99); 24 Apr 2014 03:10:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Apr 2014 03:10:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8ED8E990268; Thu, 24 Apr 2014 03:10:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Date: Thu, 24 Apr 2014 03:10:48 -0000 Message-Id: In-Reply-To: <49bd4ac92a5d4233bee70bc682eb8a60@git.apache.org> References: <49bd4ac92a5d4233bee70bc682eb8a60@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.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/acdbbb93 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/acdbbb93 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/acdbbb93 Branch: refs/heads/trunk Commit: acdbbb934023ba9cee24d85766fec9d73dcb4b1e Parents: cf74bcf 8cf97db Author: Dave Brosius Authored: Wed Apr 23 23:06:49 2014 -0400 Committer: Dave Brosius Committed: Wed Apr 23 23:06:49 2014 -0400 ---------------------------------------------------------------------- bin/cqlsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------