[1/2] git commit: fix merge

2014-07-30 Thread marcuse
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:

[1/2] git commit: fix merge-created bad map key lookup type

2014-05-23 Thread dbrosius
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:

[1/2] git commit: Fix merge

2014-03-03 Thread marcuse
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:

[1/2] git commit: Fix merge (s//= in CompositesSearcher)

2013-09-10 Thread aleksey
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:

[1/2] git commit: fix merge error; recompile Cassandra.java with thrift 0.7.0

2012-01-18 Thread eevans
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: