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 841919716 for ; Fri, 24 Feb 2012 15:50:06 +0000 (UTC) Received: (qmail 3108 invoked by uid 500); 24 Feb 2012 15:50:06 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 3076 invoked by uid 500); 24 Feb 2012 15:50:06 -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 3068 invoked by uid 99); 24 Feb 2012 15:50:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Feb 2012 15:50:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Feb 2012 15:50:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D5F41812CCB; Fri, 24 Feb 2012 15:49:22 +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: [10/50] git commit: Merge branch 'cassandra-1.1' into trunk Message-Id: <20120224154922.D5F41812CCB@tyr.zones.apache.org> Date: Fri, 24 Feb 2012 15:49:22 +0000 (UTC) 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/a9769371 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9769371 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9769371 Branch: refs/heads/cassandra-1.1 Commit: a9769371be6c2caed978f8a3ecffd1aec6ed1eac Parents: aa18705 87b786f Author: Sylvain Lebresne Authored: Wed Feb 22 11:40:28 2012 +0100 Committer: Sylvain Lebresne Committed: Wed Feb 22 11:40:28 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 5 ++++- bin/cqlsh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9769371/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a04cbd6,0732d3e..086eb0b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -8,9 -8,10 +8,11 @@@ * Fix bug with counters in super columns (CASSANDRA-3821) Merged from 1.0: * remove the wait on hint future during write (CASSANDRA-3870) + * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933) + * (cqlsh) look for cqlshlib relative to realpath (CASSANDRA-3767) + 1.1-beta1 * add nodetool rebuild_index (CASSANDRA-3583) * add nodetool rangekeysample (CASSANDRA-2917)