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/89e792fc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89e792fc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89e792fc Branch: refs/heads/trunk Commit: 89e792fc5930dec6d81776d1aa6c09bbc36e3b28 Parents: 1f7628c 26c4262 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Jun 18 20:23:36 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Jun 18 20:23:36 2013 +0300 ---------------------------------------------------------------------- .../org/apache/cassandra/cli/CliClient.java | 26 ++++++++++---------- test/unit/org/apache/cassandra/cli/CliTest.java | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/89e792fc/src/java/org/apache/cassandra/cli/CliClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/89e792fc/test/unit/org/apache/cassandra/cli/CliTest.java ----------------------------------------------------------------------
