Merge branch 'cassandra-2.2' into cassandra-3.0
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/d0632077
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d0632077
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d0632077
Branch: refs/heads/cassandra-3.0
Commit: d0632077932f4a0c20f96a7cbda277595bc316fa
Parents: e99b7cd f3ad68c
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Fri Sep 18 16:33:01 2015 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Fri Sep 18 16:33:01 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0632077/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index cc57ba6,a83fd53..248192e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,15 +1,22 @@@
-2.2.2
+3.0.0-rc1
+ * Add custom query expressions to SELECT (CASSANDRA-10217)
+ * Fix minor bugs in MV handling (CASSANDRA-10362)
+ * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124)
+ * Improve MV schema representation (CASSANDRA-9921)
+ * Add flag to enable/disable coordinator batchlog for MV writes
(CASSANDRA-10230)
+ * Update cqlsh COPY for new internal driver serialization interface
(CASSANDRA-10318)
+ * Give index implementations more control over rebuild operations
(CASSANDRA-10312)
+ * Update index file format (CASSANDRA-10314)
+ * Add "shadowable" row tombstones to deal with mv timestamp issues
(CASSANDRA-10261)
+ * CFS.loadNewSSTables() broken for pre-3.0 sstables
+ * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
+ * Small optimizations of sstable index serialization (CASSANDRA-10232)
+ * Support for both encrypted and unencrypted native transport connections
(CASSANDRA-9590)
+Merged from 2.2:
* 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)
+ * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
Merged from 2.1:
+ * Fix potential ClassCastException during paging (CASSANDRA-10352)
* Prevent ALTER TYPE from creating circular references (CASSANDRA-10339)
* Fix cache handling of 2i and base tables (CASSANDRA-10155, 10359)
* Fix NPE in nodetool compactionhistory (CASSANDRA-9758)
