cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [09/10] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X
Date Mon, 16 Jan 2017 16:37:14 GMT
Merge branch 'cassandra-3.11' into cassandra-3.X


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7c19c60
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7c19c60
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7c19c60

Branch: refs/heads/trunk
Commit: e7c19c609a8d708cd3b36d80ff44376f3a7554a8
Parents: 92cb311 e63c7a0
Author: Yuki Morishita <yukim@apache.org>
Authored: Mon Jan 16 10:35:35 2017 -0600
Committer: Yuki Morishita <yukim@apache.org>
Committed: Mon Jan 16 10:35:35 2017 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 src/java/org/apache/cassandra/db/UnfilteredDeserializer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7c19c60/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f1343b8,9c0b51b..3a0c78d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -132,8 -111,8 +132,9 @@@
   * Restore resumable hints delivery (CASSANDRA-11960)
   * Properly report LWT contention (CASSANDRA-12626)
  Merged from 3.0:
+  * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
   * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794)
 + * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
   * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
   * Add parent repair session id to anticompaction log message (CASSANDRA-12186)
   * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905)


Mime
View raw message