[4/8] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1

Merge branch 'cassandra-1.0' into cassandra-1.1 Conflicts: .rat-excludes 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/5a175336 Tree:

[4/8] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1

Merge branch 'cassandra-1.0' into cassandra-1.1 Conflicts: NEWS.txt src/java/org/apache/cassandra/config/DatabaseDescriptor.java src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java src/java/org/apache/cassandra/service/MigrationManager.java Project: