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/78cad84a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78cad84a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78cad84a Branch: refs/heads/trunk Commit: 78cad84aee38c4682a6badb5c482e4fb84dc2df5 Parents: 712615e 229da37 Author: Jonathan Ellis <[email protected]> Authored: Thu Oct 17 23:11:41 2013 +0100 Committer: Jonathan Ellis <[email protected]> Committed: Thu Oct 17 23:11:41 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 4 +--- build.xml | 3 +++ .../compaction/LeveledCompactionStrategy.java | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/78cad84a/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/78cad84a/build.xml ----------------------------------------------------------------------
