Merge branch 'cassandra-2.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/494cc32d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/494cc32d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/494cc32d Branch: refs/heads/trunk Commit: 494cc32d26fcbda0842bc0159c169f72116bbc46 Parents: fe4606c 05952e7 Author: Dave Brosius <[email protected]> Authored: Sun Sep 22 23:48:32 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Sun Sep 22 23:48:32 2013 -0400 ---------------------------------------------------------------------- pylib/cqlshlib/helptopics.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
