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 4496F18619 for ; Thu, 26 Nov 2015 14:44:29 +0000 (UTC) Received: (qmail 12733 invoked by uid 500); 26 Nov 2015 14:44:29 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 12452 invoked by uid 500); 26 Nov 2015 14:44:28 -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 12176 invoked by uid 99); 26 Nov 2015 14:44:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Nov 2015 14:44:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BB20FE2C42; Thu, 26 Nov 2015 14:44:28 +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 Date: Thu, 26 Nov 2015 14:44:30 -0000 Message-Id: <0363250e9b5642c8b0a532d5ac82d257@git.apache.org> In-Reply-To: <6bc3bdfc323e4f0abb17cbf750d78c56@git.apache.org> References: <6bc3bdfc323e4f0abb17cbf750d78c56@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4dab0f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4dab0f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4dab0f9 Branch: refs/heads/cassandra-3.0 Commit: f4dab0f9b3a037c952aaa71219987eb4f44535e5 Parents: 64a3bfd e4f3dba Author: Sylvain Lebresne Authored: Thu Nov 26 15:44:18 2015 +0100 Committer: Sylvain Lebresne Committed: Thu Nov 26 15:44:18 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/utils/MD5Digest.java | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4dab0f9/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 04cda25,d31645a..eab04fb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -14,7 -4,16 +14,8 @@@ Merged from 2.2 * Fix SimpleDateType type compatibility (CASSANDRA-10027) * (Hadoop) fix splits calculation (CASSANDRA-10640) * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) - * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) - * Use most up-to-date version of schema for system tables (CASSANDRA-10652) - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) - * Expose phi values from failure detector via JMX and tweak debug - and trace logging (CASSANDRA-9526) - * Fix RangeNamesQueryPager (CASSANDRA-10509) - * Deprecate Pig support (CASSANDRA-10542) - * Reduce contention getting instances of CompositeType (CASSANDRA-10433) Merged from 2.1: + * Force encoding when computing statement ids (CASSANDRA-10755) * Properly reject counters as map keys (CASSANDRA-10760) * Fix the sstable-needs-cleanup check (CASSANDRA-10740) * (cqlsh) Print column names before COPY operation (CASSANDRA-8935)