Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52a10696 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52a10696 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52a10696 Branch: refs/heads/trunk Commit: 52a10696aeb88bf055ff1800ab6a557598bac7a5 Parents: a2b1b8a 2e87c43 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Thu Sep 24 09:44:04 2015 -0700 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Thu Sep 24 09:44:04 2015 -0700 ---------------------------------------------------------------------- pylib/cqlshlib/helptopics.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
