Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab7aa57b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab7aa57b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab7aa57b Branch: refs/heads/trunk Commit: ab7aa57b376658e87a8fd4221ddc7712734ffcd8 Parents: 39bca48 420c91c Author: Stefan Podkowinski <s.podkowin...@gmail.com> Authored: Mon Apr 3 20:14:57 2017 +0200 Committer: Stefan Podkowinski <s.podkowin...@gmail.com> Committed: Mon Apr 3 20:15:23 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab7aa57b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 42e476f,fc7a2bb..3632903 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -69,6 -19,8 +69,7 @@@ * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) * Address message coalescing regression (CASSANDRA-12676) Merged from 3.0: + * Fix hint delivery when using ext+internal IPs with prefer_local enabled (CASSANDRA-13020) - * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors (CASSANDRA-13389) * Legacy deserializer can create empty range tombstones (CASSANDRA-13341) * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384) * Use the Kernel32 library to retrieve the PID on Windows and fix startup checks (CASSANDRA-13333) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab7aa57b/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
