Merge branch 'cassandra-1.0' into cassandra-1.1.0
Conflicts:
build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83371ebe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83371ebe
Diff:
Merge branch 'cassandra-1.0' into cassandra-1.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f22b223b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f22b223b
Diff: