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/9606a17b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9606a17b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9606a17b Branch: refs/heads/trunk Commit: 9606a17b364a10d2aeb2977dd448fd6d51bfcada Parents: 12f17b2 5ac5ee6 Author: Yuki Morishita <[email protected]> Authored: Wed Jan 7 22:13:21 2015 -0600 Committer: Yuki Morishita <[email protected]> Committed: Wed Jan 7 22:13:21 2015 -0600 ---------------------------------------------------------------------- .../apache/cassandra/db/DirectoriesTest.java | 25 ++++++++------------ 1 file changed, 10 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9606a17b/test/unit/org/apache/cassandra/db/DirectoriesTest.java ----------------------------------------------------------------------
