cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Fri, 18 Dec 2015 23:30:56 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2800bf10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2800bf10
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2800bf10

Branch: refs/heads/trunk
Commit: 2800bf1082e773daf0af29516b61c711acda626b
Parents: fa18880 bcd68b5
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Dec 18 23:30:16 2015 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Dec 18 23:30:16 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/2800bf10/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 199e374,88ef42e..b4419fa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 -2.2.5
 +3.0.3
 + * Add back support for 3rd party auth providers to bulk loader (CASSANDRA-10873)
 + * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
 + * (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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2800bf10/bin/cqlsh.py
----------------------------------------------------------------------


Mime
View raw message