Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0934bffa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0934bffa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0934bffa Branch: refs/heads/trunk Commit: 0934bffa107cb9c13062a1cfbff986339f622847 Parents: fc416fa 8581be8 Author: Yuki Morishita <[email protected]> Authored: Fri Dec 7 11:42:45 2012 -0600 Committer: Yuki Morishita <[email protected]> Committed: Fri Dec 7 11:42:45 2012 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cli/CliClient.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
