You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/01/22 18:03:09 UTC
[3/6] cassandra git commit: Revert "Flush dropped_columns when
flushing schema"
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/trunk
Commit: d2b70517d63b8cf8e5072ec449955cab9b34d408
Parents: b214722
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 22 18:02:04 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
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<String> 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,