You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2016/03/11 23:50:36 UTC
[01/10] cassandra git commit: (cqlsh) Fix error when result is 0 rows
with EXPAND ON
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 c947a2c42 -> 971d64954
refs/heads/cassandra-3.0 2d48ddf21 -> 854a243af
refs/heads/cassandra-3.5 2257a7a7e -> de44900a3
refs/heads/trunk 8097d390a -> 0ac03a20c
(cqlsh) Fix error when result is 0 rows with EXPAND ON
patch by yukim; reviewed by thobbs for CASSANDRA-11092
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/971d6495
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/971d6495
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/971d6495
Branch: refs/heads/cassandra-2.2
Commit: 971d6495438f2a344233b5579b9c86c248b7c62c
Parents: c947a2c
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Mar 11 16:20:33 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Mar 11 16:20:33 2016 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/971d6495/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 87bb0c0..b37ef84 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)
* Fix intra-node serialization issue for multicolumn-restrictions (CASSANDRA-11196)
* Non-obsoleting compaction operations over compressed files can impose rate limit on normal reads (CASSANDRA-11301)
* Add missing newline at end of bin/cqlsh (CASSANDRA-11325)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/971d6495/bin/cqlsh.py
----------------------------------------------------------------------
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 9082d72..d135317 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1312,8 +1312,13 @@ class Shell(cmd.Cmd):
def print_static_result(self, column_names, rows, table_meta):
if not column_names and not table_meta:
return
+
column_names = column_names or table_meta.columns.keys()
formatted_names = [self.myformat_colname(name, table_meta) for name in column_names]
+ if not rows:
+ # print header only
+ self.print_formatted_result(formatted_names, None)
+ return
formatted_values = [map(self.myformat_value, row.values()) for row in rows]
if self.expand_enabled:
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
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/854a243a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/854a243a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/854a243a
Branch: refs/heads/cassandra-3.5
Commit: 854a243af91d1e5ca16ac7c03e5a437187323095
Parents: 2d48ddf 971d649
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Mar 11 16:27:42 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Mar 11 16:27:42 2016 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/854a243a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 541f11c,b37ef84..3b5e51f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,7 +1,12 @@@
-2.2.6
+3.0.5
+ * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
+ * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)
+ * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
+ * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
+ * 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)
- * Fix intra-node serialization issue for multicolumn-restrictions (CASSANDRA-11196)
- * Non-obsoleting compaction operations over compressed files can impose rate limit on normal reads (CASSANDRA-11301)
* 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/854a243a/bin/cqlsh.py
----------------------------------------------------------------------
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
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/854a243a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/854a243a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/854a243a
Branch: refs/heads/cassandra-3.0
Commit: 854a243af91d1e5ca16ac7c03e5a437187323095
Parents: 2d48ddf 971d649
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Mar 11 16:27:42 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Mar 11 16:27:42 2016 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/854a243a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 541f11c,b37ef84..3b5e51f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,7 +1,12 @@@
-2.2.6
+3.0.5
+ * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
+ * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)
+ * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
+ * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
+ * 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)
- * Fix intra-node serialization issue for multicolumn-restrictions (CASSANDRA-11196)
- * Non-obsoleting compaction operations over compressed files can impose rate limit on normal reads (CASSANDRA-11301)
* 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/854a243a/bin/cqlsh.py
----------------------------------------------------------------------
[02/10] cassandra git commit: (cqlsh) Fix error when result is 0 rows
with EXPAND ON
Posted by yu...@apache.org.
(cqlsh) Fix error when result is 0 rows with EXPAND ON
patch by yukim; reviewed by thobbs for CASSANDRA-11092
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/971d6495
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/971d6495
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/971d6495
Branch: refs/heads/cassandra-3.0
Commit: 971d6495438f2a344233b5579b9c86c248b7c62c
Parents: c947a2c
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Mar 11 16:20:33 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Mar 11 16:20:33 2016 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/971d6495/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 87bb0c0..b37ef84 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)
* Fix intra-node serialization issue for multicolumn-restrictions (CASSANDRA-11196)
* Non-obsoleting compaction operations over compressed files can impose rate limit on normal reads (CASSANDRA-11301)
* Add missing newline at end of bin/cqlsh (CASSANDRA-11325)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/971d6495/bin/cqlsh.py
----------------------------------------------------------------------
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 9082d72..d135317 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1312,8 +1312,13 @@ class Shell(cmd.Cmd):
def print_static_result(self, column_names, rows, table_meta):
if not column_names and not table_meta:
return
+
column_names = column_names or table_meta.columns.keys()
formatted_names = [self.myformat_colname(name, table_meta) for name in column_names]
+ if not rows:
+ # print header only
+ self.print_formatted_result(formatted_names, None)
+ return
formatted_values = [map(self.myformat_value, row.values()) for row in rows]
if self.expand_enabled:
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
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/854a243a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/854a243a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/854a243a
Branch: refs/heads/trunk
Commit: 854a243af91d1e5ca16ac7c03e5a437187323095
Parents: 2d48ddf 971d649
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Mar 11 16:27:42 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Mar 11 16:27:42 2016 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/854a243a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 541f11c,b37ef84..3b5e51f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,7 +1,12 @@@
-2.2.6
+3.0.5
+ * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
+ * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)
+ * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
+ * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
+ * 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)
- * Fix intra-node serialization issue for multicolumn-restrictions (CASSANDRA-11196)
- * Non-obsoleting compaction operations over compressed files can impose rate limit on normal reads (CASSANDRA-11301)
* 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/854a243a/bin/cqlsh.py
----------------------------------------------------------------------
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.5
Posted by yu...@apache.org.
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 <yu...@apache.org>
Authored: Fri Mar 11 16:30:21 2016 -0600
Committer: Yuki Morishita <yu...@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
----------------------------------------------------------------------
[03/10] cassandra git commit: (cqlsh) Fix error when result is 0 rows
with EXPAND ON
Posted by yu...@apache.org.
(cqlsh) Fix error when result is 0 rows with EXPAND ON
patch by yukim; reviewed by thobbs for CASSANDRA-11092
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/971d6495
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/971d6495
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/971d6495
Branch: refs/heads/cassandra-3.5
Commit: 971d6495438f2a344233b5579b9c86c248b7c62c
Parents: c947a2c
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Mar 11 16:20:33 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Mar 11 16:20:33 2016 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/971d6495/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 87bb0c0..b37ef84 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)
* Fix intra-node serialization issue for multicolumn-restrictions (CASSANDRA-11196)
* Non-obsoleting compaction operations over compressed files can impose rate limit on normal reads (CASSANDRA-11301)
* Add missing newline at end of bin/cqlsh (CASSANDRA-11325)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/971d6495/bin/cqlsh.py
----------------------------------------------------------------------
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 9082d72..d135317 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1312,8 +1312,13 @@ class Shell(cmd.Cmd):
def print_static_result(self, column_names, rows, table_meta):
if not column_names and not table_meta:
return
+
column_names = column_names or table_meta.columns.keys()
formatted_names = [self.myformat_colname(name, table_meta) for name in column_names]
+ if not rows:
+ # print header only
+ self.print_formatted_result(formatted_names, None)
+ return
formatted_values = [map(self.myformat_value, row.values()) for row in rows]
if self.expand_enabled:
[10/10] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ac03a20
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ac03a20
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ac03a20
Branch: refs/heads/trunk
Commit: 0ac03a20c013e93d978ddf5cdf2e645be18de410
Parents: 8097d39 de44900
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Mar 11 16:47:49 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Mar 11 16:47:49 2016 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ac03a20/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ac03a20/bin/cqlsh.py
----------------------------------------------------------------------
diff --cc bin/cqlsh.py
index f8cd32d,3cdeb35..3be72b4
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1328,16 -1373,14 +1328,21 @@@ class Shell(cmd.Cmd)
def print_static_result(self, column_names, rows, table_meta):
if not column_names and not table_meta:
return
+
column_names = column_names or table_meta.columns.keys()
+ formatted_names = [self.myformat_colname(name, table_meta) for name in column_names]
+ if not rows:
+ # print header only
+ self.print_formatted_result(formatted_names, None)
+ return
- formatted_values = [map(self.myformat_value, row.values()) for row in rows]
+
+ cql_types = []
+ if table_meta:
+ ks_meta = self.conn.metadata.keyspaces[table_meta.keyspace_name]
+ cql_types = [CqlType(table_meta.columns[c].cql_type, ks_meta)
+ if c in table_meta.columns else None for c in column_names]
+
- formatted_names = [self.myformat_colname(name, table_meta) for name in column_names]
+ formatted_values = [map(self.myformat_value, row.values(), cql_types) for row in rows]
if self.expand_enabled:
self.print_formatted_result_vertically(formatted_names, formatted_values)
[04/10] cassandra git commit: (cqlsh) Fix error when result is 0 rows
with EXPAND ON
Posted by yu...@apache.org.
(cqlsh) Fix error when result is 0 rows with EXPAND ON
patch by yukim; reviewed by thobbs for CASSANDRA-11092
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/971d6495
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/971d6495
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/971d6495
Branch: refs/heads/trunk
Commit: 971d6495438f2a344233b5579b9c86c248b7c62c
Parents: c947a2c
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Mar 11 16:20:33 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Mar 11 16:20:33 2016 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/971d6495/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 87bb0c0..b37ef84 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)
* Fix intra-node serialization issue for multicolumn-restrictions (CASSANDRA-11196)
* Non-obsoleting compaction operations over compressed files can impose rate limit on normal reads (CASSANDRA-11301)
* Add missing newline at end of bin/cqlsh (CASSANDRA-11325)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/971d6495/bin/cqlsh.py
----------------------------------------------------------------------
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 9082d72..d135317 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1312,8 +1312,13 @@ class Shell(cmd.Cmd):
def print_static_result(self, column_names, rows, table_meta):
if not column_names and not table_meta:
return
+
column_names = column_names or table_meta.columns.keys()
formatted_names = [self.myformat_colname(name, table_meta) for name in column_names]
+ if not rows:
+ # print header only
+ self.print_formatted_result(formatted_names, None)
+ return
formatted_values = [map(self.myformat_value, row.values()) for row in rows]
if self.expand_enabled:
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.5
Posted by yu...@apache.org.
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/trunk
Commit: de44900a3ed0f4ff8041591860c1d0a30e94dff6
Parents: 2257a7a 854a243
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Mar 11 16:30:21 2016 -0600
Committer: Yuki Morishita <yu...@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
----------------------------------------------------------------------