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/c64d3a53
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c64d3a53
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c64d3a53
Branch: refs/heads/trunk
Commit: c64d3a53b2c79cdc9ad544e7b96c2ef712129382
Parents: 15ac9e8 c116207
Author: Tyler Hobbs <[email protected]>
Authored: Thu Feb 18 11:09:52 2016 -0600
Committer: Tyler Hobbs <[email protected]>
Committed: Thu Feb 18 11:09:52 2016 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/db/marshal/UserType.java | 2 +-
.../cql3/validation/entities/JsonTest.java | 19 +++++++++++++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c64d3a53/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f68eea5,c85fc45..a79a411
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,9 +1,21 @@@
-2.2.6
+3.0.4
+ * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721)
+ * Add query time validation method on Index (CASSANDRA-11043)
+ * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128)
+ * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
+ * AssertionError when listing sstable files on inconsistent disk state
(CASSANDRA-11156)
+ * Fix wrong rack counting and invalid conditions check for TokenAllocation
+ (CASSANDRA-11139)
+ * Avoid creating empty hint files (CASSANDRA-11090)
+ * Fix leak detection strong reference loop using weak reference
(CASSANDRA-11120)
+ * Configurie BatchlogManager to stop delayed tasks on shutdown
(CASSANDRA-11062)
+ * Hadoop integration is incompatible with Cassandra Driver 3.0.0
(CASSANDRA-11001)
+ * Add dropped_columns to the list of schema table so it gets handled
+ properly (CASSANDRA-11050)
+Merged from 2.2:
+ * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
* Better error message for cleanup (CASSANDRA-10991)
* cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
- * Use cloned TokenMetadata in size estimates to avoid race against
membership check
- (CASSANDRA-10736)
* Always persist upsampled index summaries (CASSANDRA-10512)
* (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
* Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c64d3a53/src/java/org/apache/cassandra/db/marshal/UserType.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c64d3a53/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
----------------------------------------------------------------------
