You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/08/16 20:51:21 UTC
[1/3] git commit: cqlsh: add support for multiline comments
Updated Branches:
refs/heads/cassandra-2.0 69397ef5f -> 62b709fa1
cqlsh: add support for multiline comments
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5798
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/41409770
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41409770
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41409770
Branch: refs/heads/cassandra-2.0
Commit: 41409770d458e2367d9379d33a94a5e0d60d463a
Parents: ebab9d3
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Aug 16 21:46:42 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Aug 16 21:46:42 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 2 +-
pylib/cqlshlib/cql3handling.py | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/41409770/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7630084..f44cdb9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,7 @@
* (Hadoop) add CqlPagingRecordReader support for ReversedType in Thrift table
(CASSANDRA-5718)
* Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868)
+ * cqlsh: add support for multiline comments (CASSANDRA-5798)
Merged from 1.1:
* Correctly validate sparse composite cells in scrub (CASSANDRA-5855)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/41409770/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index f0db1b3..b50bcf2 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -32,7 +32,7 @@ exit 1
from __future__ import with_statement
description = "CQL Shell for Apache Cassandra"
-version = "3.1.6"
+version = "3.1.7"
from StringIO import StringIO
from itertools import groupby
http://git-wip-us.apache.org/repos/asf/cassandra/blob/41409770/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index ca95766..82e14d4 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -223,7 +223,7 @@ JUNK ::= /([ \t\r\f\v]+|(--|[/][/])[^\n\r]*([\n\r]|$)|[/][*].*?[*][/])/ ;
<unclosedString> ::= /'([^']|'')*/ ;
<unclosedName> ::= /"([^"]|"")*/ ;
-<unclosedComment> ::= /[/][*][^\n]*$/ ;
+<unclosedComment> ::= /[/][*].*$/ ;
<term> ::= <stringLiteral>
| <integer>
[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Conflicts:
CHANGES.txt
bin/cqlsh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ad0031f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ad0031f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ad0031f
Branch: refs/heads/cassandra-2.0
Commit: 0ad0031fd8b871b51538cfd10b65933f26a9f783
Parents: 7e02052 4140977
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Aug 16 21:50:18 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Aug 16 21:50:18 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/cql3handling.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ad0031f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5b6d62c,f44cdb9..8aed84e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,7 +1,27 @@@
-1.2.9
- * migrate 1.1 schema_columnfamilies.key_alias column to key_aliases
- (CASSANDRA-5800)
- * add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831)
+2.0.0-rc2
+ * enable vnodes by default (CASSANDRA-5869)
+ * fix CAS contention timeout (CASSANDRA-5830)
+ * fix HsHa to respect max frame size (CASSANDRA-4573)
+ * Fix (some) 2i on composite components omissions (CASSANDRA-5851)
+ * cqlsh: add DESCRIBE FULL SCHEMA variant (CASSANDRA-5880)
+Merged from 1.2:
+ * Correctly validate sparse composite cells in scrub (CASSANDRA-5855)
+ * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868)
++ * cqlsh: add support for multiline comments (CASSANDRA-5798)
+
+
+2.0.0-rc1
+ * improve DecimalSerializer performance (CASSANDRA-5837)
+ * fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690)
+ * fix schema-related trigger issues (CASSANDRA-5774)
+ * Better validation when accessing CQL3 table from thrift (CASSANDRA-5138)
+ * Fix assertion error during repair (CASSANDRA-5801)
+ * Fix range tombstone bug (CASSANDRA-5805)
+ * DC-local CAS (CASSANDRA-5797)
+ * Add a native_protocol_version column to the system.local table (CASSANRDA-5819)
+ * Use index_interval from cassandra.yaml when upgraded (CASSANDRA-5822)
+ * Fix buffer underflow on socket close (CASSANDRA-5792)
+Merged from 1.2:
* fix bulk-loading compressed sstables (CASSANDRA-5820)
* (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter
(CASSANDRA-5824)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ad0031f/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
[3/3] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/62b709fa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62b709fa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62b709fa
Branch: refs/heads/cassandra-2.0
Commit: 62b709fa169fe0cc41264b8cc457b7ef969d04a2
Parents: 69397ef 0ad0031
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Aug 16 21:51:08 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Aug 16 21:51:08 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/cql3handling.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/62b709fa/CHANGES.txt
----------------------------------------------------------------------