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/e1d60f61 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1d60f61 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1d60f61 Branch: refs/heads/trunk Commit: e1d60f6192fd0aaa2962e0753497097d96f95f0b Parents: dda7b2b 08e7f4c Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sun Mar 24 18:04:50 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sun Mar 24 18:05:50 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- src/java/org/apache/cassandra/cli/CliClient.java | 6 +++--- src/java/org/apache/cassandra/cli/CliUtils.java | 6 ++++++ 3 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1d60f61/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1d60f61/src/java/org/apache/cassandra/cli/CliClient.java ----------------------------------------------------------------------
