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 7A0AF115A1 for ; Wed, 23 Jul 2014 20:05:20 +0000 (UTC) Received: (qmail 79796 invoked by uid 500); 23 Jul 2014 20:05:20 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 79577 invoked by uid 500); 23 Jul 2014 20:05:20 -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 79284 invoked by uid 99); 23 Jul 2014 20:05:19 -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, 23 Jul 2014 20:05:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B83749B1DAA; Wed, 23 Jul 2014 20:05:19 +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 Date: Wed, 23 Jul 2014 20:05:22 -0000 Message-Id: In-Reply-To: <95e1df0144464829a6ded2b39d3ba68b@git.apache.org> References: <95e1df0144464829a6ded2b39d3ba68b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/7] git commit: update changes update changes Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7b7a249 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7b7a249 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7b7a249 Branch: refs/heads/cassandra-2.1.0 Commit: c7b7a249395df3faea1397704a56e3849f76871a Parents: cfedc00 Author: Brandon Williams Authored: Wed Jul 23 15:04:33 2014 -0500 Committer: Brandon Williams Committed: Wed Jul 23 15:04:33 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7b7a249/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5ba30cc..caef095 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,9 @@ +2.1.0-final + * Fix cqlsh display when zero rows are returned (CASSANDRA-7580) + * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572) + 2.1.0-rc4 + * Fix word count hadoop example (CASSANDRA-7200) * Updated memtable_cleanup_threshold and memtable_flush_writers defaults (CASSANDRA-7551) * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)