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 812AF18D1A for ; Fri, 22 Jan 2016 17:03:07 +0000 (UTC) Received: (qmail 53675 invoked by uid 500); 22 Jan 2016 17:03:07 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 53638 invoked by uid 500); 22 Jan 2016 17:03:07 -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 53625 invoked by uid 99); 22 Jan 2016 17:03: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; Fri, 22 Jan 2016 17:03:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 38062E0098; Fri, 22 Jan 2016 17:03:07 +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: Fri, 22 Jan 2016 17:03:07 -0000 Message-Id: <51a7875903eb45d2afd4f1d9110b59a5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/6] cassandra git commit: Revert "Flush dropped_columns when flushing schema" Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 b21472277 -> d2b70517d refs/heads/cassandra-3.3 94c4bdb6f -> dd816b3d7 refs/heads/trunk aa2d31b18 -> e74ca0432 Revert "Flush dropped_columns when flushing schema" This reverts commit b214722770113398d22c6c00d46ce0510d868ff9. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d2b70517 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2b70517 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2b70517 Branch: refs/heads/cassandra-3.0 Commit: d2b70517d63b8cf8e5072ec449955cab9b34d408 Parents: b214722 Author: Sylvain Lebresne Authored: Fri Jan 22 18:02:04 2016 +0100 Committer: Sylvain Lebresne Committed: Fri Jan 22 18:02:04 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 -- src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2b70517/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 8bfb1d1..4a0bca8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,4 @@ 3.0.3 - * Add dropped_columns to the list of schema table so it gets handled - properly (CASSANDRA-11050) * Update CQL documentation (CASSANDRA-10899) * Check the column name, not cell name, for dropped columns when reading legacy sstables (CASSANDRA-11018) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2b70517/src/java/org/apache/cassandra/schema/SchemaKeyspace.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java index f91ec9c..f1ea6cf 100644 --- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java +++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java @@ -82,7 +82,7 @@ public final class SchemaKeyspace public static final String INDEXES = "indexes"; public static final List ALL = - ImmutableList.of(KEYSPACES, TABLES, COLUMNS, DROPPED_COLUMNS, TRIGGERS, VIEWS, TYPES, FUNCTIONS, AGGREGATES, INDEXES); + ImmutableList.of(KEYSPACES, TABLES, COLUMNS, TRIGGERS, VIEWS, TYPES, FUNCTIONS, AGGREGATES, INDEXES); private static final CFMetaData Keyspaces = compile(KEYSPACES,