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 73586200B8B for ; Tue, 20 Sep 2016 04:32:18 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7219A160AE0; Tue, 20 Sep 2016 02:32:18 +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 B2219160ADC for ; Tue, 20 Sep 2016 04:32:17 +0200 (CEST) Received: (qmail 33917 invoked by uid 500); 20 Sep 2016 02:32:09 -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 30782 invoked by uid 99); 20 Sep 2016 02:32:07 -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; Tue, 20 Sep 2016 02:32:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C9EF8E04D9; Tue, 20 Sep 2016 02:32:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zznate@apache.org To: commits@cassandra.apache.org Date: Tue, 20 Sep 2016 02:32:52 -0000 Message-Id: <615d49e4f8a947cc8cd241e620066f93@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [46/50] [abbrv] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 archived-at: Tue, 20 Sep 2016 02:32:18 -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/ade38b20 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ade38b20 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ade38b20 Branch: refs/heads/cassandra-3.0 Commit: ade38b20740b8ce2e626e256d2e2f934a3024a16 Parents: 4bc3aa9 465496f Author: Nate McCall Authored: Tue Sep 20 14:13:10 2016 +1200 Committer: Nate McCall Committed: Tue Sep 20 14:15:03 2016 +1200 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- .../org/apache/cassandra/transport/RequestThreadPoolExecutor.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ade38b20/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b61c76c,6c5fded..6759897 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -78,10 -22,13 +78,11 @@@ Merged from 2.2 * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214) * Synchronize ThriftServer::stop() (CASSANDRA-12105) * Use dedicated thread for JMX notifications (CASSANDRA-12146) - * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143) * Improve streaming synchronization and fault tolerance (CASSANDRA-11414) * MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973) - * Don't write shadowed range tombstone (CASSANDRA-12030) Merged from 2.1: - * Fix queries with empty ByteBuffer values in clustering column restrictions (CASSANDRA-12127) + * Add system property to set the max number of native transport requests in queue (CASSANDRA-11363) + * Fix queries with empty ByteBuffer values in clustering column restrictions (CASSANDRA-12127) * Disable passing control to post-flush after flush failure to prevent data loss (CASSANDRA-11828) * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040) * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)