Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
test/long/org/apache/cassandra/db/LongFlushMemtableTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bda32583
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bda32583
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bda32583
Branch: refs/heads/trunk
Commit: bda32583f239f65d3249f309bc190414cfa2e903
Parents: ffd0ae4 d47d2b1
Author: Benedict Elliott Smith <bened...@apache.org>
Authored: Wed Jan 28 22:39:30 2015 +0000
Committer: Benedict Elliott Smith <bened...@apache.org>
Committed: Wed Jan 28 22:39:30 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
