Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aab47117
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aab47117
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8436ee61
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8436ee61
Diff: http:/
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/992eff29
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/992eff29
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
NEWS.txt
build.xml
debian/changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d62a553
Tree: http://git-wip-
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/config/CFMetaData.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.apa
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/336a665a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/336a665a
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2777e1e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2777e1e5
Diff: http://git-wip-us.apache.org/repos/asf
