Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
src/java/org/apache/cassandra/config/CFMetaData.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/228f0ade
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/228f0ade
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/228f0ade
Branch: refs/heads/trunk
Commit: 228f0ade8d5f570575db62a0fea19cdb33c821a0
Parents: 9268820 6976d82
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Mon Aug 11 04:08:47 2014 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Mon Aug 11 04:08:47 2014 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
