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/09d3d2b8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09d3d2b8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09d3d2b8

Branch: refs/heads/trunk
Commit: 09d3d2b839172c37bd2a6605ff29bfbcb1d735bb
Parents: 2ef78c6 9382c4b
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Wed Jul 17 15:02:42 2013 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Wed Jul 17 15:02:42 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/cli/CliClient.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/09d3d2b8/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------

Reply via email to