cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mish...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Tue, 09 Sep 2014 22:13:27 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	pylib/cqlshlib/cql3handling.py


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b1774b78
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b1774b78
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b1774b78

Branch: refs/heads/trunk
Commit: b1774b7879e4deff0f60cb8496ef59e81ba167b7
Parents: b867050 1456ec8
Author: Mikhail Stepura <mishail@apache.org>
Authored: Tue Sep 9 15:13:12 2014 -0700
Committer: Mikhail Stepura <mishail@apache.org>
Committed: Tue Sep 9 15:13:12 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                    |  1 +
 bin/cqlsh                      |  8 ++++++++
 doc/cql3/CQL.textile           | 33 +++++++++++++++++++++++++++++++++
 pylib/cqlshlib/cql3handling.py | 24 ++++++++++++++++++++++++
 4 files changed, 66 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1774b78/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c151969,1706faf..f264cd7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
 +3.0
 + * Support Java source code for user-defined functions (CASSANDRA-7562)
 + * Require arg types to disambiguate UDF drops (CASSANDRA-7812)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Verify that UDF class methods are static (CASSANDRA-7781)
 + * Support pure user-defined functions (CASSANDRA-7395, 7740)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 +
  2.1.1
+  * (cqlsh) tab-completion for triggers (CASSANDRA-7824)
   * (cqlsh): Support for query paging (CASSANDRA-7514)
   * (cqlsh): Show progress of COPY operations (CASSANDRA-7789)
   * Add syntax to remove multiple elements from a map (CASSANDRA-6599)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1774b78/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/cql3handling.py
index 9512a8b,43882de..63d6a69
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@@ -228,12 -228,12 +228,14 @@@ JUNK ::= /([ \t\r\f\v]+|(--|[/][/])[^\n
                            | <createColumnFamilyStatement>
                            | <createIndexStatement>
                            | <createUserTypeStatement>
 +                          | <createFunctionStatement>
+                           | <createTriggerStatement>
                            | <dropKeyspaceStatement>
                            | <dropColumnFamilyStatement>
                            | <dropIndexStatement>
                            | <dropUserTypeStatement>
 +                          | <dropFunctionStatement>
+                           | <dropTriggerStatement>
                            | <alterTableStatement>
                            | <alterKeyspaceStatement>
                            | <alterUserTypeStatement>


Mime
View raw message