Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9533b587 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9533b587 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9533b587 Branch: refs/heads/trunk Commit: 9533b587f0e04b496615ffb884cc2d7530799314 Parents: 14ebfbf bb09d3c Author: Jonathan Ellis <[email protected]> Authored: Sat Dec 14 09:57:06 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Sat Dec 14 09:57:06 2013 -0600 ---------------------------------------------------------------------- test/Test.iml | 214 ----------------------------------------------------- 1 file changed, 214 deletions(-) ----------------------------------------------------------------------
