Merge branch 'cassandra-1.1' into cassandra-1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8581be8a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8581be8a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8581be8a Branch: refs/heads/cassandra-1.2 Commit: 8581be8a2beef81b89e571351c6e05ed51dde718 Parents: bac9794 1ac9058 Author: Yuki Morishita <yu...@apache.org> Authored: Fri Dec 7 11:42:17 2012 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Fri Dec 7 11:42:17 2012 -0600 ---------------------------------------------------------------------- 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/8581be8a/src/java/org/apache/cassandra/cli/CliClient.java ----------------------------------------------------------------------
