Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05952e7c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05952e7c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05952e7c Branch: refs/heads/trunk Commit: 05952e7c6e72d971eed1d447f7ff23c5daf361e3 Parents: 7ce28f8 7fdcbd0 Author: Dave Brosius <[email protected]> Authored: Sun Sep 22 23:47:59 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Sun Sep 22 23:47:59 2013 -0400 ---------------------------------------------------------------------- pylib/cqlshlib/helptopics.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/05952e7c/pylib/cqlshlib/helptopics.py ----------------------------------------------------------------------
