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

Updated Branches: refs/heads/cassandra-1.1 d64b9fff5 - 5a175336f 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:

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

Updated Branches: refs/heads/cassandra-1.1 10b3dcc96 - e46753381 Merge branch 'cassandra-1.0' into cassandra-1.1 Conflicts: src/java/org/apache/cassandra/cql/QueryProcessor.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

Updated Branches: refs/heads/cassandra-1.1 7108f3ed3 - 1616f3fa4 Merge branch 'cassandra-1.0' into cassandra-1.1 Conflicts: src/java/org/apache/cassandra/db/filter/QueryFilter.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: