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/9c0b180a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c0b180a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c0b180a

Branch: refs/heads/trunk
Commit: 9c0b180a42968118074ea22725174bc9f104f88f
Parents: 5c379c5 2ccb3da
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Sat Dec 7 13:56:43 2013 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Sat Dec 7 13:56:43 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/9c0b180a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
----------------------------------------------------------------------

Reply via email to