This is an automated email from the ASF dual-hosted git repository.
aweisberg pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 609af8c2e5ebb46a1c7120bf5201ef4c2f511e38
Merge: b875399 b51d3c9
Author: Ariel Weisberg <aweisb...@apple.com>
AuthorDate: Fri Jan 18 12:41:01 2019 -0500
Merge branch 'cassandra-3.11' into trunk
.circleci/config.yml | 2 +-
CHANGES.txt | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --cc CHANGES.txt
index 8e0b0c7,d85a4af..706a3ed
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -373,7 -33,10 +373,8 @@@ 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:
+ * CircleCI docker image should bake in more dependencies (CASSANDRA-14985)
- * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
* MigrationManager attempts to pull schema from different major version
nodes (CASSANDRA-14928)
- * Fix incorrect cqlsh results when selecting same columns multiple times
(CASSANDRA-13262)
* Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
Merged from 2.1:
* Paged Range Slice queries with DISTINCT can drop rows from results
(CASSANDRA-14956)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
