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 6EEE4180F4 for ; Thu, 12 Nov 2015 15:45:50 +0000 (UTC) Received: (qmail 1647 invoked by uid 500); 12 Nov 2015 15:45:48 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 1385 invoked by uid 500); 12 Nov 2015 15:45:48 -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 739 invoked by uid 99); 12 Nov 2015 15:45:48 -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, 12 Nov 2015 15:45:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 65417E5E1F; Thu, 12 Nov 2015 15:45:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Thu, 12 Nov 2015 15:45:57 -0000 Message-Id: <30e7a1b552d849f7993b06c9d46d6fa6@git.apache.org> In-Reply-To: <1ce6aea7eaac461f8c2c1b78e4d2e1ad@git.apache.org> References: <1ce6aea7eaac461f8c2c1b78e4d2e1ad@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/15] 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/b54836b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b54836b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b54836b1 Branch: refs/heads/trunk Commit: b54836b120a0acc5d820f3465a7354eea73d9290 Parents: 0de23f2 d84b42b Author: Yuki Morishita Authored: Thu Nov 12 09:44:59 2015 -0600 Committer: Yuki Morishita Committed: Thu Nov 12 09:44:59 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b54836b1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 02dc249,2cfcb55..8f1b163 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -51,7 -6,15 +51,8 @@@ Merged from 2.2 * 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: + * Shutdown compaction in drain to prevent leak (CASSANDRA-10079) - * Invalidate cache after stream receive task is completed (CASSANDRA-10341) - * Reject counter writes in CQLSSTableWriter (CASSANDRA-10258) - * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605) - * Improve json2sstable error reporting on nonexistent columns (CASSANDRA-10401) * (cqlsh) fix COPY using wrong variable name for time_format (CASSANDRA-10633) * Do not run SizeEstimatesRecorder if a node is not a member of the ring (CASSANDRA-9912) * Improve handling of dead nodes in gossip (CASSANDRA-10298)