Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B7137200C4D for ; Wed, 1 Mar 2017 03:06:42 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B5D73160B81; Wed, 1 Mar 2017 02:06:42 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 15A10160B7E for ; Wed, 1 Mar 2017 03:06:41 +0100 (CET) Received: (qmail 55415 invoked by uid 500); 1 Mar 2017 02:06:40 -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 55050 invoked by uid 99); 1 Mar 2017 02:06:40 -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, 01 Mar 2017 02:06:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3380FE005E; Wed, 1 Mar 2017 02:06:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aweisberg@apache.org To: commits@cassandra.apache.org Date: Wed, 01 Mar 2017 02:06:46 -0000 Message-Id: <88ed2b5006214f17acfcf5047fd30d3f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 archived-at: Wed, 01 Mar 2017 02:06:42 -0000 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/56d3f932 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56d3f932 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56d3f932 Branch: refs/heads/trunk Commit: 56d3f9324909be7b59ea057fc280faec28532f84 Parents: df28bcf aa66c99 Author: Ariel Weisberg Authored: Tue Feb 28 19:49:52 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 28 19:49:52 2017 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56d3f932/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5cdc2e4,c27c2b1..a63bd12 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,7 +1,11 @@@ -2.2.10 +3.0.12 + * Faster StreamingHistogram (CASSANDRA-13038) + * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237) + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070) + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185) +Merged from 2.2 + * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232) * Coalescing strategy sleeps too much (CASSANDRA-13090) - * Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100) * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202) * Fix failing COPY TO STDOUT (CASSANDRA-12497) * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222) http://git-wip-us.apache.org/repos/asf/cassandra/blob/56d3f932/build.xml ---------------------------------------------------------------------- diff --cc build.xml index 2d2d313,d815ede..69b6bdf --- a/build.xml +++ b/build.xml @@@ -159,8 -152,13 +160,9 @@@ + - - - - @@@ -1131,10 -1181,9 +1133,10 @@@ debug="true" debuglevel="${debuglevel}" destdir="${test.classes}" - includeantruntime="false" + includeantruntime="true" source="${source.version}" - target="${target.version}"> + target="${target.version}" + encoding="utf-8">