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 D5AB69182 for ; Wed, 22 Feb 2012 10:41:04 +0000 (UTC) Received: (qmail 73511 invoked by uid 500); 22 Feb 2012 10:41:04 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 73462 invoked by uid 500); 22 Feb 2012 10:41:04 -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 73444 invoked by uid 99); 22 Feb 2012 10:41:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Feb 2012 10:41:04 +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; Wed, 22 Feb 2012 10:41:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 58D938121E1; Wed, 22 Feb 2012 10:40:41 +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: [2/4] git commit: Update changelog Message-Id: <20120222104041.58D938121E1@tyr.zones.apache.org> Date: Wed, 22 Feb 2012 10:40:41 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Update changelog Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87b786f4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87b786f4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87b786f4 Branch: refs/heads/trunk Commit: 87b786f402d564f991367cb1fa1c44db648c163b Parents: c691e09 Author: Sylvain Lebresne Authored: Wed Feb 22 11:40:13 2012 +0100 Committer: Sylvain Lebresne Committed: Wed Feb 22 11:40:13 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87b786f4/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 2caea60..0732d3e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,6 +8,8 @@ * 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