Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ccb3da7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ccb3da7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ccb3da7 Branch: refs/heads/trunk Commit: 2ccb3da7cd238110403d03bfebe46d6e4ed1be23 Parents: 3c15ff2 faa9d51 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Dec 7 13:55:59 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Dec 7 13:55:59 2013 +0300 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/DirectoriesTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ccb3da7/test/unit/org/apache/cassandra/db/DirectoriesTest.java ----------------------------------------------------------------------
