Merge branch 'cassandra-2.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/9274197b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9274197b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9274197b Branch: refs/heads/trunk Commit: 9274197b4bdb343731b964f2fcd8f70814f42a41 Parents: ba581f4 d230922 Author: Tyler Hobbs <[email protected]> Authored: Fri Oct 31 14:17:11 2014 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Fri Oct 31 14:17:11 2014 -0500 ---------------------------------------------------------------------- pylib/cqlshlib/helptopics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9274197b/pylib/cqlshlib/helptopics.py ----------------------------------------------------------------------
