Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f55df0b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f55df0b8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f55df0b8 Branch: refs/heads/trunk Commit: f55df0b85ed0b404a287ec72763967f2d305427e Parents: 2cc34df ca32e05 Author: Robert Stupp <sn...@snazy.de> Authored: Tue Dec 1 10:41:07 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Tue Dec 1 10:41:07 2015 +0100 ---------------------------------------------------------------------- bin/cqlsh.py | 11 ++++++++--- pylib/cqlshlib/helptopics.py | 25 ++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f55df0b8/bin/cqlsh.py ---------------------------------------------------------------------- diff --cc bin/cqlsh.py index 6b87d9f,7435f00..1a44d0d --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -71,6 -71,7 +71,7 @@@ except ImportError CQL_LIB_PREFIX = 'cassandra-driver-internal-only-' CASSANDRA_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..') -CASSANDRA_CQL_HTML_FALLBACK = 'https://cassandra.apache.org/doc/cql3/CQL-3.0.html' ++CASSANDRA_CQL_HTML_FALLBACK = 'https://cassandra.apache.org/doc/cql3/CQL-3.2.html' # default location of local CQL.html if os.path.exists(CASSANDRA_PATH + '/doc/cql3/CQL.html'):
