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/01b3508e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/01b3508e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/01b3508e Branch: refs/heads/trunk Commit: 01b3508e0f0025bb859d96fb163ff457d3d94662 Parents: 99880d2 2800bf1 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Dec 18 23:30:39 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Dec 18 23:30:39 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 21 +++++++-------------- 2 files changed, 8 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/01b3508e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 47863e9,b4419fa..0df24d5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -27,8 -4,13 +27,9 @@@ Merged from 3.0 * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-1837) * Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806) 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) further optimise COPY FROM (CASSANDRA-9302) * Allow CREATE TABLE WITH ID (CASSANDRA-9179) http://git-wip-us.apache.org/repos/asf/cassandra/blob/01b3508e/bin/cqlsh.py ----------------------------------------------------------------------
