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/aecd6301 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aecd6301 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aecd6301 Branch: refs/heads/trunk Commit: aecd6301169870bff7f4fff1a0e86e0cb363bc5d Parents: 7223195 d349787 Author: Dave Brosius <dbros...@apache.org> Authored: Fri May 10 21:15:37 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Fri May 10 21:15:37 2013 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cli/CliClient.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aecd6301/src/java/org/apache/cassandra/cli/CliClient.java ----------------------------------------------------------------------
