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/5c379c54 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c379c54 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c379c54 Branch: refs/heads/trunk Commit: 5c379c54b9c1806152e83a5cce76fc9ad14e1228 Parents: e6170fe 3c15ff2 Author: Aleksey Yeschenko <[email protected]> Authored: Sat Dec 7 13:32:16 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Sat Dec 7 13:32:16 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/Directories.java | 2 +- .../apache/cassandra/db/DirectoriesTest.java | 22 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c379c54/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c379c54/src/java/org/apache/cassandra/db/Directories.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c379c54/test/unit/org/apache/cassandra/db/DirectoriesTest.java ----------------------------------------------------------------------
