Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6581abfa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6581abfa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6581abfa Branch: refs/heads/trunk Commit: 6581abfae5f3dc06a7a555bdc8b16fcde6f38970 Parents: decc308 dd6a229 Author: Jonathan Ellis <[email protected]> Authored: Wed May 21 13:21:10 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed May 21 13:21:10 2014 -0500 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/cli/CliTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
