Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9dd22110 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9dd22110 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9dd22110 Branch: refs/heads/cassandra-1.1 Commit: 9dd221102cb3a0ab70d49b5171c4496e01eb229c Parents: 2b0c84d f22b223 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Mar 1 10:40:02 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Mar 1 10:40:02 2012 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cli/CliClient.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9dd22110/src/java/org/apache/cassandra/cli/CliClient.java ----------------------------------------------------------------------