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 BD15111C7E for ; Thu, 10 Jul 2014 17:11:03 +0000 (UTC) Received: (qmail 57962 invoked by uid 500); 10 Jul 2014 17:11:02 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 57866 invoked by uid 500); 10 Jul 2014 17:11:02 -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 57569 invoked by uid 99); 10 Jul 2014 17:11:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jul 2014 17:11:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0D87D9AB81D; Thu, 10 Jul 2014 17:11:02 +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: Thu, 10 Jul 2014 17:11:07 -0000 Message-Id: <5290a1c5069147869baa155de736042c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0 Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a9d4b89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a9d4b89 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a9d4b89 Branch: refs/heads/trunk Commit: 1a9d4b89d5331d8677dd9d59795d39c3a4138610 Parents: 420c685 11351e3 Author: Brandon Williams Authored: Thu Jul 10 12:10:32 2014 -0500 Committer: Brandon Williams Committed: Thu Jul 10 12:10:32 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/security/SSLFactory.java | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a9d4b89/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e459638,6b4e44b..5132976 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,27 -1,5 +1,28 @@@ -2.0.10 +2.1.0-final + * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505) + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521) +Merged from 2.0: + * Warn when SSL certificates have expired (CASSANDRA-7528) + * Fix error when doing reversed queries with static columns (CASSANDRA-7490) + + +2.1.0-rc3 + * Consider expiry when reconciling otherwise equal cells (CASSANDRA-7403) + * Introduce CQL support for stress tool (CASSANDRA-6146) + * 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) + * Fix error when CONTAINS is used with a bind marker (CASSANDRA-7502) + * Properly reject unknown UDT field (CASSANDRA-7484) +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