Updated Branches:
refs/heads/cassandra-1.1.0 adc0931e8 - 9ad9c2475
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/9ad9c247
Tree:
Updated Branches:
refs/heads/cassandra-1.1.0 68032e940 - e05a327e2
Merge branch 'cassandra-1.0' into cassandra-1.1.0
Conflicts:
src/java/org/apache/cassandra/cql/DeleteStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Updated Branches:
refs/heads/cassandra-1.1.0 aa7516847 - f9454d00b
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/f9454d00
Tree: