Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/db/compaction/LegacyLeveledManifest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be236eae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be236eae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be236eae
Branch: refs/heads/trunk
Commit: be236eae29f98e14e746cc8d03efd4b41d7fb7d4
Parents: c0d328b 102e911
Author: Marcus Eriksson <marc...@spotify.com>
Authored: Wed Sep 25 14:58:21 2013 +0200
Committer: Marcus Eriksson <marc...@spotify.com>
Committed: Wed Sep 25 14:58:21 2013 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/be236eae/CHANGES.txt
----------------------------------------------------------------------
