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/6e66cf5f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e66cf5f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e66cf5f Branch: refs/heads/trunk Commit: 6e66cf5f2a40c7d24848b081020cb1abffb10157 Parents: f3b2a6b 35b2151 Author: Marcus Eriksson <[email protected]> Authored: Tue Mar 18 08:10:42 2014 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Tue Mar 18 08:10:42 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 1 + .../org/apache/cassandra/config/Config.java | 1 + .../org/apache/cassandra/io/util/FileUtils.java | 27 ++++++++------------ .../cassandra/service/CassandraDaemon.java | 9 +++++++ .../cassandra/service/StorageService.java | 19 ++++++++++++++ 6 files changed, 41 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e66cf5f/CHANGES.txt ----------------------------------------------------------------------
