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 A3A70200C40 for ; Wed, 8 Mar 2017 18:20:08 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A1EE8160B73; Wed, 8 Mar 2017 17:20:08 +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 E1F62160B89 for ; Wed, 8 Mar 2017 18:20:07 +0100 (CET) Received: (qmail 86291 invoked by uid 500); 8 Mar 2017 17:20:06 -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 86025 invoked by uid 99); 8 Mar 2017 17:20:06 -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, 08 Mar 2017 17:20:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4A4FFE009D; Wed, 8 Mar 2017 17:20:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ifesdjeen@apache.org To: commits@cassandra.apache.org Date: Wed, 08 Mar 2017 17:20:10 -0000 Message-Id: <9ca3e64dc162463ab07aeef7e50ef1df@git.apache.org> In-Reply-To: <6be3d2859523490aa0510db74b75fd0d@git.apache.org> References: <6be3d2859523490aa0510db74b75fd0d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11 archived-at: Wed, 08 Mar 2017 17:20:08 -0000 Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7707a0ed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7707a0ed Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7707a0ed Branch: refs/heads/cassandra-3.11 Commit: 7707a0ed59e0f22a864b3c05515df7f1041e3c42 Parents: 1248d36 60d3292 Author: Alex Petrov Authored: Wed Mar 8 18:02:19 2017 +0100 Committer: Alex Petrov Committed: Wed Mar 8 18:02:19 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../unit/org/apache/cassandra/cql3/CQLTester.java | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7707a0ed/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 88599b7,0979852..f73dc12 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,10 +1,15 @@@ -3.0.13 +3.11.0 + * Fix equality comparisons of columns using the duration type (CASSANDRA-13174) + * Obfuscate password in stress-graphs (CASSANDRA-12233) + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034) + * nodetool stopdaemon errors out (CASSANDRA-13030) + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954) + * Fix primary index calculation for SASI (CASSANDRA-12910) + * More fixes to the TokenAllocator (CASSANDRA-12990) + * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) + * Address message coalescing regression (CASSANDRA-12676) +Merged from 3.0: + * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238) -Merged from 2.2: - * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053) - - -3.0.12 * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to LogRecord absolute path (CASSANDRA-13294) * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233) * Cqlsh copy-from should error out when csv contains invalid data for collections (CASSANDRA-13071) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7707a0ed/test/unit/org/apache/cassandra/cql3/CQLTester.java ----------------------------------------------------------------------