Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e10da08
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e10da08
Diff: http://git-wip-us.apache.org/repos/a
Merge branch 'cassandra-1.1.0' into cassandra-1.1
Conflicts:
CHANGES.txt
NEWS.txt
src/java/org/apache/cassandra/config/KSMetaData.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/073038c8
T