You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/10/13 18:26:16 UTC
[3/5] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89596682
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89596682
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89596682
Branch: refs/heads/trunk
Commit: 89596682e8c495f0c6c76e0f7a21a6db96d00552
Parents: 2d825a1 a85afbc
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue Oct 13 11:21:31 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue Oct 13 11:21:31 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 7 ++++---
bin/cqlsh.py | 13 +++++--------
2 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/89596682/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0714076,ff70045..3641afc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,10 +1,29 @@@
- 2.2.4
- * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487)
-2.1.11
+2.2.3
+ * Avoid NoClassDefFoundError during DataDescriptor initialization on windows (CASSANDRA-10412)
+ * Preserve case of quoted Role & User names (CASSANDRA-10394)
+ * cqlsh pg-style-strings broken (CASSANDRA-10484)
+ * Make Hadoop CF splits more polite to custom orderered partitioners (CASSANDRA-10400)
++ * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487)
+Merged from 2.1:
* Fix mmap file segment seeking to EOF (CASSANDRA-10478)
* Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275)
* Mark nodes as dead even if they've already left (CASSANDRA-10205)
- * Update internal python driver used by cqlsh (CASSANDRA-10161)
+ * Update internal python driver used by cqlsh (CASSANDRA-10161, CASSANDRA-10507)
+
-2.1.10
++
+2.2.2
+ * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
+ * Configurable page size in cqlsh (CASSANDRA-9855)
+ * Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761)
+ * Cancel transaction for sstables we wont redistribute index summary
+ for (CASSANDRA-10270)
+ * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
+ * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222)
+ * Fix failure to start with space in directory path on Windows (CASSANDRA-10239)
+ * Fix repair hang when snapshot failed (CASSANDRA-10057)
+ * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
+ (CASSANDRA-10199)
+Merged from 2.1:
* Bulk Loader API could not tolerate even node failure (CASSANDRA-10347)
* Avoid misleading pushed notifications when multiple nodes
share an rpc_address (CASSANDRA-10052)