cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Thu, 11 Feb 2016 16:31:56 GMT
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/9b5af911
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b5af911
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b5af911

Branch: refs/heads/cassandra-3.0
Commit: 9b5af911c9bfdedaeb6562e0e13e9f44e6dbd4e0
Parents: b2f38ef 6b1bd17
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Thu Feb 11 10:29:46 2016 -0600
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Thu Feb 11 10:29:46 2016 -0600

----------------------------------------------------------------------
 CHANGES.txt                                     |  3 +-
 src/java/org/apache/cassandra/cql3/Json.java    | 10 ++-
 .../cassandra/cql3/selection/Selection.java     |  2 +-
 .../apache/cassandra/db/marshal/AsciiType.java  |  2 +-
 .../apache/cassandra/db/marshal/MapType.java    |  2 +-
 .../apache/cassandra/db/marshal/UTF8Type.java   |  2 +-
 .../apache/cassandra/db/marshal/UserType.java   |  2 +-
 .../cql3/validation/entities/JsonTest.java      | 70 +++++++++++++++++---
 8 files changed, 77 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5af911/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e723aba,3aca720..9be4f38
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -2.2.6
 +3.0.4
 + * 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.6:
++Merged from 2.2:
+  * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
   * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281)
   * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
   * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5af911/src/java/org/apache/cassandra/cql3/Json.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5af911/src/java/org/apache/cassandra/cql3/selection/Selection.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5af911/src/java/org/apache/cassandra/db/marshal/AsciiType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5af911/src/java/org/apache/cassandra/db/marshal/MapType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5af911/src/java/org/apache/cassandra/db/marshal/UTF8Type.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5af911/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
----------------------------------------------------------------------


Mime
View raw message