Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 3da7d9e25 - 40d7bdf80
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cde56662
Tree:
Repository: cassandra
Updated Branches:
refs/heads/trunk deee02c53 - f5c54aac9
fix merge-created bad map key lookup type
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f64dc452
Tree:
Repository: cassandra
Updated Branches:
refs/heads/trunk e80564f39 - 2c8100af2
Fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04395312
Tree:
Updated Branches:
refs/heads/trunk 36610aaf7 - 382261218
Fix merge (s//= in CompositesSearcher)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ff0d8e9
Tree:
Updated Branches:
refs/heads/trunk 7c92fc52e - bce44ff32
fix merge error; recompile Cassandra.java with thrift 0.7.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bce44ff3
Tree: