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/87b7aad2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87b7aad2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87b7aad2 Branch: refs/heads/trunk Commit: 87b7aad23771ded45c30dbaf47a7ed3049044475 Parents: 9129b6e 7b1331f Author: Robert Stupp <sn...@snazy.de> Authored: Sat Mar 28 12:20:34 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Sat Mar 28 12:20:34 2015 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Directories.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87b7aad2/src/java/org/apache/cassandra/db/Directories.java ----------------------------------------------------------------------
