[1/3] git commit: fix merge of 7519

2014-09-07 Thread benedict
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 77d0c1757 - a44d641e8 refs/heads/trunk eec381e0d - f203f0f3f fix merge of 7519 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a44d641e Tree:

[1/3] git commit: fix merge

2014-03-14 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 e0718bcdf - 47675ce75 refs/heads/trunk 5011437b1 - 572731247 fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47675ce7 Tree:

[1/3] git commit: fix merge

2013-11-26 Thread jbellis
Updated Branches: refs/heads/cassandra-2.0 ab4cc9c00 - f15681b67 refs/heads/trunk a13c6dcbb - f15d6d591 fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f15681b6 Tree:

[1/3] git commit: fix merge again

2013-10-18 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-2.0 ff5db5635 - 99bef9dfe refs/heads/trunk 8e0aa710d - 50b08f2b2 fix merge again Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99bef9df Tree:

[1/3] git commit: fix merge

2013-10-17 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-2.0 cb585ef9e - 4dc5d690f refs/heads/trunk 8ec455d84 - a9d64ef86 fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4dc5d690 Tree: