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 9932311D23 for ; Mon, 7 Jul 2014 05:14:06 +0000 (UTC) Received: (qmail 74068 invoked by uid 500); 7 Jul 2014 05:14:05 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 73986 invoked by uid 500); 7 Jul 2014 05:14:05 -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 73580 invoked by uid 99); 7 Jul 2014 05:14:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jul 2014 05:14:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 39C059A0C56; Mon, 7 Jul 2014 05:14:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Mon, 07 Jul 2014 05:14:12 -0000 Message-Id: <2911fc517ce44b28a73c58fb2cd6cf95@git.apache.org> In-Reply-To: <4143517836b04709b652492124e010cb@git.apache.org> References: <4143517836b04709b652492124e010cb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/13] git commit: merge from 2.0 merge from 2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/547cf1d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/547cf1d1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/547cf1d1 Branch: refs/heads/cassandra-2.1 Commit: 547cf1d10d933684dbeaeeb9aa0593973d4dc87e Parents: 48ff36a a14211f Author: Jonathan Ellis Authored: Mon Jul 7 00:13:44 2014 -0500 Committer: Jonathan Ellis Committed: Mon Jul 7 00:13:44 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cassandra | 7 +++++++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/547cf1d1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index aa20d84,23be338..b609795 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,5 +1,17 @@@ -2.0.10 +2.1.0 + * Fix ClassCastException processing expired messages (CASSANDRA-7496) + * Fix prepared marker for collections inside UDT (CASSANDRA-7472) + * Remove left-over populate_io_cache_on_flush and replicate_on_write + uses (CASSANDRA-7493) + * (Windows) handle spaces in path names (CASSANDRA-7451) + * Ensure writes have completed after dropping a table, before recycling + commit log segments (CASSANDRA-7437) + * Remove left-over rows_per_partition_to_cache (CASSANDRA-7493) +Merged from 2.0: + * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394) + * Support DISTINCT for static columns and fix behaviour when DISTINC is + not use (CASSANDRA-7305). + * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254) * Fix race in FileCacheService RemovalListener (CASSANDRA-7278) * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM operations to incorrect become full QUORUM (CASSANDRA-7345) http://git-wip-us.apache.org/repos/asf/cassandra/blob/547cf1d1/bin/cassandra ----------------------------------------------------------------------