Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0bfdebc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0bfdebc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0bfdebc Branch: refs/heads/cassandra-2.1 Commit: a0bfdebcaae6056440961b7d1c6b1efefa911e4f Parents: 047c67e 8c4ffbe Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Jul 3 14:29:45 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Jul 3 14:29:45 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 9 +++++++++ .../org/apache/cassandra/config/DatabaseDescriptor.java | 5 +++++ .../org/apache/cassandra/db/compaction/LeveledManifest.java | 5 ++++- 4 files changed, 19 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0bfdebc/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0bfdebc/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ----------------------------------------------------------------------
