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/4f4c390b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f4c390b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f4c390b Branch: refs/heads/cassandra-3.11 Commit: 4f4c390bc105c5e407bfe8b04c282ac28862e451 Parents: f8acbd2 3d48cbc Author: Ariel Weisberg <aweisb...@apple.com> Authored: Mon Aug 6 12:06:46 2018 -0400 Committer: Ariel Weisberg <aweisb...@apple.com> Committed: Mon Aug 6 12:06:46 2018 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f4c390b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ab64ab9,7e4d88c..e2d1681 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -3.0.18 +3.11.4 +Merged from 3.0: + * sstableloader should use discovered broadcast address to connect intra-cluster (CASSANDRA-14522) * Fix reading columns with non-UTF names from schema (CASSANDRA-14468) Merged from 2.2: * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f4c390b/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
