Updated Branches: refs/heads/trunk 4fb396319 -> bb5fdbf4b
merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb5fdbf4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb5fdbf4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb5fdbf4 Branch: refs/heads/trunk Commit: bb5fdbf4b5f558278e9b6ab1f28c888fdffd8bdf Parents: 4fb3963 119fa05 Author: Pavel Yaskevich <pove...@gmail.com> Authored: Sun Jan 29 04:33:34 2012 +0200 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Sun Jan 29 04:35:37 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cli/CliClient.java | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb5fdbf4/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb5fdbf4/src/java/org/apache/cassandra/cli/CliClient.java ----------------------------------------------------------------------