Merge branch 'cassandra-1.0' into cassandra-1.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f22b223b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f22b223b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f22b223b Branch: refs/heads/trunk Commit: f22b223bb369de442492dd9239760630bbec2ad2 Parents: 2a5b3ef bc05b59 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Mar 1 10:39:57 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Mar 1 10:39:57 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/f22b223b/src/java/org/apache/cassandra/cli/CliClient.java ----------------------------------------------------------------------
