Updated Branches: refs/heads/trunk 934339acd -> 3727ad770
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3727ad77 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3727ad77 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3727ad77 Branch: refs/heads/trunk Commit: 3727ad7700ccb4684d63afd6a58911d769b92a31 Parents: 934339a b1abbf2 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Mar 5 07:01:52 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Mar 5 07:01:52 2013 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cli/CliClient.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3727ad77/src/java/org/apache/cassandra/cli/CliClient.java ----------------------------------------------------------------------
