Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d1f8e40 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d1f8e40 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d1f8e40 Branch: refs/heads/trunk Commit: 4d1f8e4045cd6edbeb0cca843078728fb4a34360 Parents: 7bd5773 13daf89 Author: Robert Stupp <[email protected]> Authored: Sun Dec 27 17:28:42 2015 +0100 Committer: Robert Stupp <[email protected]> Committed: Sun Dec 27 17:28:42 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d1f8e40/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 77d9410,b1a556a..991549a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -36,7 -12,12 +36,8 @@@ Merged from 2.2 * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813) * Add new types to Stress (CASSANDRA-9556) * Add property to allow listening on broadcast interface (CASSANDRA-9748) - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835) - * Better handling of SSL connection errors inter-node (CASSANDRA-10816) - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761) Merged from 2.1: + * cqlsh fails to decode utf-8 characters for text typed columns (CASSANDRA-10875) * Log error when stream session fails (CASSANDRA-9294) * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593) * (cqlsh) further optimise COPY FROM (CASSANDRA-9302) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d1f8e40/bin/cqlsh.py ----------------------------------------------------------------------
