Updated Branches: refs/heads/cassandra-1.0 2d6c8729e -> bc05b5960 refs/heads/cassandra-1.1 2b0c84d5d -> 9dd221102 refs/heads/cassandra-1.1.0 2a5b3ef04 -> f22b223bb refs/heads/trunk d6ad445e4 -> 3d5529d47
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d5529d4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d5529d4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d5529d4 Branch: refs/heads/trunk Commit: 3d5529d470d3215066d9caef4e76f1af8f018589 Parents: d6ad445 9dd2211 Author: Brandon Williams <[email protected]> Authored: Thu Mar 1 10:40:10 2012 -0600 Committer: Brandon Williams <[email protected]> Committed: Thu Mar 1 10:40:10 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/3d5529d4/src/java/org/apache/cassandra/cli/CliClient.java ----------------------------------------------------------------------
