[1/3] git commit: fix bad merge

2014-01-13 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-2.0 71a5127ae - db69dceeb refs/heads/trunk fd888bcbc - e3d1e38a4 fix bad merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db69dcee Tree:

[1/3] git commit: Fix bad merge (commit: 88b9d95165b5f83896be740bcfff260ff8e2009d)

2013-03-12 Thread slebresne
Fix bad merge (commit: 88b9d95165b5f83896be740bcfff260ff8e2009d) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/444a5515 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/444a5515 Diff: