Merge branch cassandra-3.11 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c0020629 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0020629 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0020629 Branch: refs/heads/trunk Commit: c00206297be451077034daf318eb8912825e135a Parents: cad9416 303dba6 Author: Benjamin Lerer <b.le...@gmail.com> Authored: Tue Aug 8 17:13:18 2017 +0200 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Tue Aug 8 17:13:30 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/config/DatabaseDescriptor.java | 26 ++- .../org/apache/cassandra/db/Directories.java | 3 +- .../org/apache/cassandra/io/util/FileUtils.java | 181 +++++++++++++++++-- 4 files changed, 191 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0020629/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0020629/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0020629/src/java/org/apache/cassandra/db/Directories.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0020629/src/java/org/apache/cassandra/io/util/FileUtils.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org