Updated Branches: refs/heads/trunk a91b258dc -> 11965bca1
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/11965bca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11965bca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/11965bca Branch: refs/heads/trunk Commit: 11965bca182bbd7a80d750ce80653967e6ecb25e Parents: a91b258 8f81f3d Author: Pavel Yaskevich <xe...@apache.org> Authored: Tue Feb 28 00:46:53 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Tue Feb 28 00:46:53 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cli/CliClient.java | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/11965bca/src/java/org/apache/cassandra/cli/CliClient.java ----------------------------------------------------------------------