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 2015/12/15 22:39:41 UTC
[5/5] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1deb0443
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1deb0443
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1deb0443
Branch: refs/heads/cassandra-3.0
Commit: 1deb044321f1e729d99e731f94ead760deaf1898
Parents: 942e5e5 57d558f
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Dec 15 21:39:25 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Dec 15 21:39:25 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 2 +
bin/cqlsh.py | 329 ++-------------
pylib/cqlshlib/copyutil.py | 912 ++++++++++++++++++++++++++++++++++------
pylib/cqlshlib/util.py | 19 +
4 files changed, 841 insertions(+), 421 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1deb0443/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4af7573,c969a4d..e167126
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -12,38 -10,12 +13,39 @@@ Merged from 2.1
* Make Stress compiles within eclipse (CASSANDRA-10807)
* Cassandra Daemon should print JVM arguments (CASSANDRA-10764)
* Allow cancellation of index summary redistribution (CASSANDRA-8805)
- * sstableloader will fail if there are collections in the schema tables (CASSANDRA-10700)
- * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
- * Fix Stress profile parsing on Windows (CASSANDRA-10808)
+
-2.2.4
+3.0.1
+ * Avoid MV race during node decommission (CASSANDRA-10674)
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
+ * Handle single-column deletions correction in materialized views
+ when the column is part of the view primary key (CASSANDRA-10796)
+ * Fix issue with datadir migration on upgrade (CASSANDRA-10788)
+ * Fix bug with range tombstones on reverse queries and test coverage for
+ AbstractBTreePartition (CASSANDRA-10059)
+ * Remove 64k limit on collection elements (CASSANDRA-10374)
+ * Remove unclear Indexer.indexes() method (CASSANDRA-10690)
+ * Fix NPE on stream read error (CASSANDRA-10771)
+ * Normalize cqlsh DESC output (CASSANDRA-10431)
+ * Rejects partition range deletions when columns are specified (CASSANDRA-10739)
+ * Fix error when saving cached key for old format sstable (CASSANDRA-10778)
+ * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758)
+ * Fix SELECT statement with IN restrictions on partition key,
+ ORDER BY and LIMIT (CASSANDRA-10729)
+ * Improve stress performance over 1k threads (CASSANDRA-7217)
+ * Wait for migration responses to complete before bootstrapping (CASSANDRA-10731)
+ * Unable to create a function with argument of type Inet (CASSANDRA-10741)
+ * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717)
+ * Correctly preserve deletion info on updated rows when notifying indexers
+ of single-row deletions (CASSANDRA-10694)
+ * Notify indexers of partition delete during cleanup (CASSANDRA-10685)
+ * Keep the file open in trySkipCache (CASSANDRA-10669)
+ * Updated trigger example (CASSANDRA-10257)
+Merged from 2.2:
+ * Fix regression on split size in CqlInputFormat (CASSANDRA-10835)
+ * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
+ * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
+ * Fix IllegalArgumentException in DataOutputBuffer.reallocate for large buffers (CASSANDRA-10592)
* Show CQL help in cqlsh in web browser (CASSANDRA-7225)
* Serialize on disk the proper SSTable compression ratio (CASSANDRA-10775)
* Reject index queries while the index is building (CASSANDRA-8505)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1deb0443/bin/cqlsh.py
----------------------------------------------------------------------