cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Date Fri, 01 Apr 2016 18:22:10 GMT
Merge branch 'cassandra-3.0' into cassandra-3.5


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

Branch: refs/heads/trunk
Commit: 020a80b132cfabc6032f0f96f477856b87712623
Parents: 03df4c7 1a1f836
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Apr 1 19:21:00 2016 +0100
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Apr 1 19:21:00 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/schema/LegacySchemaMigrator.java  | 63 +++++++++++++++++++-
 2 files changed, 63 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/020a80b1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e94df56,0ce75a8..61265b1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.5
 +3.5
 + * Avoid index segment stitching in RAM which lead to OOM on big SSTable files (CASSANDRA-11383)
 + * Fix clustering and row filters for LIKE queries on clustering columns (CASSANDRA-11397)
 +Merged from 3.0:
+  * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943)
   * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320)
   * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131)
   * Upgrade ohc to 0.4.3

http://git-wip-us.apache.org/repos/asf/cassandra/blob/020a80b1/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
----------------------------------------------------------------------


Mime
View raw message