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/c89c3780 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c89c3780 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c89c3780 Branch: refs/heads/trunk Commit: c89c37802ab2ba1902b511323dafebce328e1f00 Parents: 406c338 a42b4e5 Author: Jonathan Ellis <[email protected]> Authored: Tue May 20 22:47:51 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue May 20 22:47:51 2014 -0500 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/DirectoriesTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
