Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bccd4a3e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bccd4a3e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bccd4a3e Branch: refs/heads/trunk Commit: bccd4a3ed34cab7c66f6a5469f6dd3b2c35574a9 Parents: 5e631a8 f4ec535 Author: Aleksey Yeschenko <[email protected]> Authored: Thu May 14 17:20:42 2015 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu May 14 17:20:42 2015 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cli/CliClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bccd4a3e/src/java/org/apache/cassandra/cli/CliClient.java ----------------------------------------------------------------------
