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/2a5b3ef0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a5b3ef0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a5b3ef0 Branch: refs/heads/cassandra-1.1 Commit: 2a5b3ef04f839ae9f596e14b836b9e321c82a07b Parents: 6ed098d 2d6c872 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Mar 1 10:34:32 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Mar 1 10:34:32 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/2a5b3ef0/src/java/org/apache/cassandra/cli/CliClient.java ----------------------------------------------------------------------
