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 E7C82185D7 for ; Mon, 11 Jan 2016 16:04:35 +0000 (UTC) Received: (qmail 65982 invoked by uid 500); 11 Jan 2016 16:04:35 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 65921 invoked by uid 500); 11 Jan 2016 16:04:35 -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 65714 invoked by uid 99); 11 Jan 2016 16:04:35 -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; Mon, 11 Jan 2016 16:04:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 81578E0985; Mon, 11 Jan 2016 16:04:35 +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: Mon, 11 Jan 2016 16:04:36 -0000 Message-Id: <8e707f1838d24a05820c039764715d51@git.apache.org> In-Reply-To: <23c45b35be974df6bef14e5a5fabe387@git.apache.org> References: <23c45b35be974df6bef14e5a5fabe387@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/5] cassandra git commit: Remove misplaced lines in the changelog (they already are in for 3.0.3, which is the correct place) Remove misplaced lines in the changelog (they already are in for 3.0.3, which is the correct place) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6fdcaef2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fdcaef2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6fdcaef2 Branch: refs/heads/trunk Commit: 6fdcaef20b93b1116352d7094ecd7447dbdf5eb3 Parents: eca74ad Author: Sylvain Lebresne Authored: Mon Jan 11 17:00:04 2016 +0100 Committer: Sylvain Lebresne Committed: Mon Jan 11 17:00:04 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fdcaef2/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 25c93e9..36a6e43 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -73,8 +73,6 @@ Merged from 2.1: * Keep the file open in trySkipCache (CASSANDRA-10669) * Updated trigger example (CASSANDRA-10257) Merged from 2.2: - * Fix regression on split size in CqlInputFormat (CASSANDRA-10835) - * Better handling of SSL connection errors inter-node (CASSANDRA-10816) * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761) * Fix IllegalArgumentException in DataOutputBuffer.reallocate for large buffers (CASSANDRA-10592) * Show CQL help in cqlsh in web browser (CASSANDRA-7225)