[1/3] git commit: fix broken merge

2014-07-29 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 6b47853d5 - 5c47d8ae1 refs/heads/trunk 82211f698 - d5deba95d fix broken merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c47d8ae Tree:

[1/3] git commit: fix broken merge

2013-10-17 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-2.0 96c0256d3 - aefa20d0f refs/heads/trunk 832c4e98b - eb711fd1d fix broken merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aefa20d0 Tree: