[3/4] git commit: Fix merge

2014-05-21 Thread slebresne
Fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82be86a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82be86a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82be86a5 Branch:

[3/4] git commit: Fix merge

2013-12-03 Thread slebresne
Fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1334f94e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1334f94e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1334f94e Branch:

[3/4] git commit: fix merge conflict

2013-10-02 Thread jbellis
fix merge conflict Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76cb10ca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76cb10ca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76cb10ca

[3/4] git commit: fix merge from 1.1

2012-11-12 Thread jbellis
fix merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66001665 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66001665 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66001665