Merge branch 'cassandra-1.2.0' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cbd73a40
Tree:
Merge branch 'cassandra-1.2.0' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/183b5520
Tree:
Merge branch 'cassandra-1.2.0' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ef67f4d
Tree:
Merge branch 'cassandra-1.2.0' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/config/CFMetaData.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: