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 7B5EE17D0C for ; Wed, 21 Oct 2015 12:30:58 +0000 (UTC) Received: (qmail 57812 invoked by uid 500); 21 Oct 2015 12:30:58 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 57518 invoked by uid 500); 21 Oct 2015 12:30:58 -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 57247 invoked by uid 99); 21 Oct 2015 12:30:58 -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; Wed, 21 Oct 2015 12:30:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ED9D4E08CD; Wed, 21 Oct 2015 12:30:57 +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: Wed, 21 Oct 2015 12:30:58 -0000 Message-Id: <1feefd584cb64b6dae41c4a74df05333@git.apache.org> In-Reply-To: <32d60ad4f3b546859f8b3ad27d220657@git.apache.org> References: <32d60ad4f3b546859f8b3ad27d220657@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 Merge branch 'cassandra-2.1' into cassandra-2.2 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/d3085b1b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d3085b1b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d3085b1b Branch: refs/heads/trunk Commit: d3085b1baa33e9dc546aa80123e0cb1c17659073 Parents: f10d2ed 9d8436f Author: Sylvain Lebresne Authored: Wed Oct 21 14:27:46 2015 +0200 Committer: Sylvain Lebresne Committed: Wed Oct 21 14:27:46 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + debian/init | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3085b1b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 560472a,31ae1c0..120be92 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,11 +1,15 @@@ -2.1.12 +2.2.4 + * 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: + * Avoid repetition of JVM_OPTS in debian package (CASSANDRA-8821) * Fix potential NPE from handling result of SIM.highestSelectivityIndex (CASSANDRA-10550) - * Fix paging issues with partitions containing only static columns data - (CASSANDRA-10381) + * Fix paging issues with partitions containing only static columns data (CASSANDRA-10381) * Fix conditions on static columns (CASSANDRA-10264) * AssertionError: attempted to delete non-existing file CommitLog (CASSANDRA-10377) - * Merge range tombstones during compaction (CASSANDRA-7953) * (cqlsh) Distinguish negative and positive infinity in output (CASSANDRA-10523) * (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970) * Don't allow startup if the node's rack has changed (CASSANDRA-10242)