cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Date Fri, 11 Mar 2016 22:50:43 GMT
Merge branch 'cassandra-3.0' into cassandra-3.5


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

Branch: refs/heads/cassandra-3.5
Commit: de44900a3ed0f4ff8041591860c1d0a30e94dff6
Parents: 2257a7a 854a243
Author: Yuki Morishita <yukim@apache.org>
Authored: Fri Mar 11 16:30:21 2016 -0600
Committer: Yuki Morishita <yukim@apache.org>
Committed: Fri Mar 11 16:30:21 2016 -0600

----------------------------------------------------------------------
 CHANGES.txt  | 1 +
 bin/cqlsh.py | 5 +++++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/de44900a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e727ad5,3b5e51f..4a060d3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -7,7 -6,9 +7,8 @@@ Merged from 3.0
   * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377)
   * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
  Merged from 2.2:
+  * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)
   * Add missing newline at end of bin/cqlsh (CASSANDRA-11325)
 - * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
   * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
   * Only log yaml config once, at startup (CASSANDRA-11217)
   * Reference leak with parallel repairs on the same table (CASSANDRA-11215)

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


Mime
View raw message