Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/db/Memtable.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/813da911
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/813da911
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/813da911
Branch: refs/heads/trunk
Commit: 813da911b9b4ba53b4da9714f3b37e76687d2904
Parents: a4ed367 800e45f
Author: Aleksey Yeschenko <[email protected]>
Authored: Sat Feb 8 04:13:41 2014 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Sat Feb 8 04:13:41 2014 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
