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 81F639B6C for ; Wed, 7 Mar 2012 10:18:01 +0000 (UTC) Received: (qmail 38161 invoked by uid 500); 7 Mar 2012 10:18:01 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 37822 invoked by uid 500); 7 Mar 2012 10:18:00 -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 37061 invoked by uid 99); 7 Mar 2012 10:17:59 -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, 07 Mar 2012 10:17:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7205E5EAD; Wed, 7 Mar 2012 10:17:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/4] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1 Message-Id: <20120307101759.7205E5EAD@tyr.zones.apache.org> Date: Wed, 7 Mar 2012 10:17:59 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.1 4fe3bb13e -> 269ed635e Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/269ed635 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/269ed635 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/269ed635 Branch: refs/heads/cassandra-1.1 Commit: 269ed635e3d52fa58cc036ac992b523bf8d6a0f9 Parents: 4fe3bb1 5f31757 Author: Sylvain Lebresne Authored: Wed Mar 7 11:17:46 2012 +0100 Committer: Sylvain Lebresne Committed: Wed Mar 7 11:17:46 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/SliceFromReadCommand.java | 2 +- .../org/apache/cassandra/cli/CliHelp.yaml | 29 +++++++++++++-- 3 files changed, 27 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/269ed635/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/269ed635/src/resources/org/apache/cassandra/cli/CliHelp.yaml ----------------------------------------------------------------------