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 5406F10877 for ; Tue, 27 May 2014 08:30:32 +0000 (UTC) Received: (qmail 58796 invoked by uid 500); 27 May 2014 08:30:32 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 58530 invoked by uid 500); 27 May 2014 08:30:32 -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 58426 invoked by uid 99); 27 May 2014 08:30:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 May 2014 08:30:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BBD0F9A664F; Tue, 27 May 2014 08:30:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Date: Tue, 27 May 2014 08:30:32 -0000 Message-Id: In-Reply-To: <6d55517a9a814114b99bfd3a6598617a@git.apache.org> References: <6d55517a9a814114b99bfd3a6598617a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 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/8602fe8c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8602fe8c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8602fe8c Branch: refs/heads/trunk Commit: 8602fe8ce85cf89319724cae84bc43912de1eb44 Parents: 7f930e0 9376fdd Author: Marcus Eriksson Authored: Tue May 27 10:29:03 2014 +0200 Committer: Marcus Eriksson Committed: Tue May 27 10:29:03 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/compaction/AbstractCompactionStrategy.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8602fe8c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 9bde1f3,42a1148..fcc1e73 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,31 -1,10 +1,32 @@@ -2.0.9 - * Add missing iso8601 patterns for date strings (6973) - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875) - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274) +2.1.0-rc1 + * Add tab-completion to debian nodetool packaging (CASSANDRA-6421) + * Change concurrent_compactors defaults (CASSANDRA-7139) + * Add PowerShell Windows launch scripts (CASSANDRA-7001) + * Make commitlog archive+restore more robust (CASSANDRA-6974) + * Fix marking commitlogsegments clean (CASSANDRA-6959) + * Add snapshot "manifest" describing files included (CASSANDRA-6326) + * Parallel streaming for sstableloader (CASSANDRA-3668) + * Fix bugs in supercolumns handling (CASSANDRA-7138) + * Fix ClassClassException on composite dense tables (CASSANDRA-7112) + * Cleanup and optimize collation and slice iterators (CASSANDRA-7107) + * Upgrade NBHM lib (CASSANDRA-7128) + * Optimize netty server (CASSANDRA-6861) + * Fix repair hang when given CF does not exist (CASSANDRA-7189) + * Allow c* to be shutdown in an embedded mode (CASSANDRA-5635) + * Add server side batching to native transport (CASSANDRA-5663) + * Make batchlog replay asynchronous (CASSANDRA-6134) + * remove unused classes (CASSANDRA-7197) + * Limit user types to the keyspace they are defined in (CASSANDRA-6643) + * Add validate method to CollectionType (CASSANDRA-7208) + * New serialization format for UDT values (CASSANDRA-7209, CASSANDRA-7261) + * Fix nodetool netstats (CASSANDRA-7270) + * Fix potential ClassCastException in HintedHandoffManager (CASSANDRA-7284) + * Use prepared statements internally (CASSANDRA-6975) + * Fix broken paging state with prepared statement (CASSANDRA-7120) + * Fix IllegalArgumentException in CqlStorage (CASSANDRA-7287) + * Allow nulls/non-existant fields in UDT (CASSANDRA-7206) +Merged from 2.0: + * Copy compaction options to make sure they are reloaded (CASSANDRA-7290) - -2.0.8 * Always reallocate buffers in HSHA (CASSANDRA-6285) * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221) * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8602fe8c/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java ----------------------------------------------------------------------