Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/db/CounterMutation.java
src/java/org/apache/cassandra/service/StorageProxy.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4ab20ba9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ab20ba9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ab20ba9
Branch: refs/heads/cassandra-2.1
Commit: 4ab20ba97f488a428e2c362ca22cefa44cbf2254
Parents: 9de8d3e e8aaffa
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Tue Jun 3 19:05:54 2014 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Tue Jun 3 19:05:54 2014 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
