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 0C06F200CFE for ; Thu, 24 Aug 2017 18:05:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0A91416B1BC; Thu, 24 Aug 2017 16:05:51 +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 550EA16B1B8 for ; Thu, 24 Aug 2017 18:05:50 +0200 (CEST) Received: (qmail 95074 invoked by uid 500); 24 Aug 2017 16:05:49 -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 95043 invoked by uid 99); 24 Aug 2017 16:05:49 -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, 24 Aug 2017 16:05:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 71E46E0395; Thu, 24 Aug 2017 16:05:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: adelapena@apache.org To: commits@cassandra.apache.org Date: Thu, 24 Aug 2017 16:05:50 -0000 Message-Id: In-Reply-To: <5f5121b38f054912a223f2bed5a8e7af@git.apache.org> References: <5f5121b38f054912a223f2bed5a8e7af@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] cassandra git commit: Merge branch 'cassandra-3.11' into trunk archived-at: Thu, 24 Aug 2017 16:05:51 -0000 Merge branch 'cassandra-3.11' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b777d62 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b777d62 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b777d62 Branch: refs/heads/trunk Commit: 4b777d6271b8900f00a23e51aa3d8e42b7a0f34b Parents: 2e5847d 000007f Author: Andrés de la Peña Authored: Thu Aug 24 17:03:41 2017 +0100 Committer: Andrés de la Peña Committed: Thu Aug 24 17:03:41 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 6 ++++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b777d62/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 92ff455,d39f78c..0a4726b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -130,8 -6,10 +130,9 @@@ * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512) * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) Merged from 3.0: + * Copy session properties on cqlsh.py do_login (CASSANDRA-13640) * Potential AssertionError during ReadRepair of range tombstone and partition deletions (CASSANDRA-13719) * Don't let stress write warmup data if n=0 (CASSANDRA-13773) - * Gossip thread slows down when using batch commit log (CASSANDRA-12966) * Randomize batchlog endpoint selection with only 1 or 2 racks (CASSANDRA-12884) * Fix digest calculation for counter cells (CASSANDRA-13750) * Fix ColumnDefinition.cellValueType() for non-frozen collection and change SSTabledump to use type.toJSONString() (CASSANDRA-13573) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b777d62/bin/cqlsh.py ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org For additional commands, e-mail: commits-help@cassandra.apache.org