Repository: cassandra Updated Branches: refs/heads/cassandra-3.11 b8c12fba0 -> 6b0076742 refs/heads/trunk bfecdf520 -> 59a4624d5
Add missed DEFAULT, UNSET, MBEAN and MBEANS keywords to `ReservedKeywords` Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b007674 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b007674 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b007674 Branch: refs/heads/cassandra-3.11 Commit: 6b00767427706124e016e4f471c2266899387163 Parents: b8c12fb Author: AndreÌs de la PenÌa <a.penya.gar...@gmail.com> Authored: Wed Jan 31 13:53:18 2018 +0000 Committer: AndreÌs de la PenÌa <a.penya.gar...@gmail.com> Committed: Thu Feb 1 20:22:03 2018 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/ReservedKeywords.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b007674/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 81b358d..2d7d8f7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.11.2 + * Add DEFAULT, UNSET, MBEAN and MBEANS to `ReservedKeywords` (CASSANDRA-14205) * Add Unittest for schema migration fix (CASSANDRA-14140) * Print correct snitch info from nodetool describecluster (CASSANDRA-13528) * Close socket on error during connect on OutboundTcpConnection (CASSANDRA-9630) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b007674/src/java/org/apache/cassandra/cql3/ReservedKeywords.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/ReservedKeywords.java b/src/java/org/apache/cassandra/cql3/ReservedKeywords.java index ee052a7..30b1a6e 100644 --- a/src/java/org/apache/cassandra/cql3/ReservedKeywords.java +++ b/src/java/org/apache/cassandra/cql3/ReservedKeywords.java @@ -85,7 +85,11 @@ class ReservedKeywords "NAN", "INFINITY", "OR", - "REPLACE" }; + "REPLACE", + "DEFAULT", + "UNSET", + "MBEAN", + "MBEANS"}; private static final Set<String> reservedSet = ImmutableSet.copyOf(reservedKeywords); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
