[2/3] git commit: Fix merge on test

2014-10-29 Thread yukim
Fix merge on test Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6c9c35c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6c9c35c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6c9c35c

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

2014-09-07 Thread benedict
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: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a44d641e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a44d641e

[2/3] git commit: fix merge

2014-03-14 Thread jbellis
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: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47675ce7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47675ce7 Branch:

[2/3] git commit: fix merge

2013-11-26 Thread jbellis
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: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f15681b6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f15681b6 Branch:

[2/3] git commit: fix merge

2013-10-17 Thread brandonwilliams
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: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4dc5d690 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4dc5d690 Branch: