Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be89dae3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be89dae3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be89dae3
Branch: refs/heads/cassandra-2.2
Commit: be89dae3ecfd98b2170732c45d7f95807d5c19af
Parents: 1c073e7 1b08cbd
Author: T Jake Luciani <j...@apache.org>
Authored: Wed Oct 7 10:13:40 2015 -0400
Committer: T Jake Luciani <j...@apache.org>
Committed: Wed Oct 7 10:13:40 2015 -0400
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
...assandra-driver-internal-only-2.6.0c2.post.zip | Bin 198346 -> 0 bytes
lib/cassandra-driver-internal-only-2.7.2.zip | Bin 0 -> 229600 bytes
3 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/be89dae3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 47fa4c2,d678efe..82ee94d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,7 +1,21 @@@
-2.1.11
+2.2.3
+ * Make Hadoop CF splits more polite to custom orderered partitioners
(CASSANDRA-10400)
-
++Merged from 2.1:
+ * Update internal python driver used by cqlsh (CASSANDRA-10161)
-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)
