Merge branch 'cassandra-1.2' into trunk

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3de31572
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3de31572
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3de31572

Branch: refs/heads/trunk
Commit: 3de315723624d80769b9a803a695b803117a51da
Parents: 47d5f12 473713f
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Fri Jun 14 11:44:29 2013 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Fri Jun 14 11:44:29 2013 -0500

----------------------------------------------------------------------
 pylib/cqlshlib/helptopics.py | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3de31572/pylib/cqlshlib/helptopics.py
----------------------------------------------------------------------

Reply via email to