cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Date Thu, 23 Feb 2017 01:09:42 GMT
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: f624b14ae586b3dfd4c4d24e04990ea083bc2c17
Parents: b3490c0 51796ea
Author: Yuki Morishita <yukim@apache.org>
Authored: Thu Feb 23 10:08:56 2017 +0900
Committer: Yuki Morishita <yukim@apache.org>
Committed: Thu Feb 23 10:08:56 2017 +0900

----------------------------------------------------------------------
 CHANGES.txt                                                        | 1 +
 .../org/apache/cassandra/db/compaction/AntiCompactionTest.java     | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f624b14a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3dc192f,afda236..ca490ba
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,17 +1,17 @@@
 -3.0.12
 +3.11.0
 + * Obfuscate password in stress-graphs (CASSANDRA-12233)
 + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
 + * nodetool stopdaemon errors out (CASSANDRA-13030)
 + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
 + * Fix primary index calculation for SASI (CASSANDRA-12910)
 + * More fixes to the TokenAllocator (CASSANDRA-12990)
 + * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
 +Merged from 3.0:
+  * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
   * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 -Merged from 2.2
 - * Fix failing COPY TO STDOUT (CASSANDRA-12497)
 - * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 - * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
 -Merged from 2.1:
 - * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 -
 -3.0.11
   * Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639)
   * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 - * Hint related logging should include the IP address of the destination in addition to

 + * Hint related logging should include the IP address of the destination in addition to
     host ID (CASSANDRA-13205)
   * Reloading logback.xml does not work (CASSANDRA-13173)
   * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109)


Mime
View raw message