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/29b988d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29b988d8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29b988d8 Branch: refs/heads/trunk Commit: 29b988d8c42de38ae16998239ee7cd3789c4993e Parents: 9dac99f 1142183 Author: Benjamin Lerer <b.le...@gmail.com> Authored: Tue Nov 24 15:09:39 2015 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Tue Nov 24 15:10:17 2015 +0100 ---------------------------------------------------------------------- bin/cqlsh.py | 57 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29b988d8/bin/cqlsh.py ---------------------------------------------------------------------- diff --cc bin/cqlsh.py index 328ba30,ffcbcbd..36daa51 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1629,12 -1573,6 +1629,12 @@@ class Shell(cmd.Cmd) In some cases, there may be index metadata which is not representable and which will not be shown. + DESCRIBE MATERIALIZED VIEW <viewname> + - Output CQL commands that could be used to recreate the given materialized view. ++ Output the CQL command that could be used to recreate the given materialized view. + In some cases, there may be materialized view metadata which is not representable + and which will not be shown. + DESCRIBE CLUSTER Output information about the connected Cassandra cluster, such as the