cassandra git commit: Fix bad merge

2017-04-04 Thread jake
Repository: cassandra Updated Branches: refs/heads/trunk 522ddba27 -> 5d8b5cce4 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/5d8b5cce Tree:

cassandra git commit: Fix bad merge

2016-05-02 Thread slebresne
Repository: cassandra Updated Branches: refs/heads/trunk b6cc43e87 -> ad7e36b8a 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/ad7e36b8 Tree:

[1/3] cassandra git commit: Fix bad merge

2016-01-07 Thread carl
Repository: cassandra Updated Branches: refs/heads/cassandra-3.3 f7843d26d -> caedc8fdc refs/heads/trunk f13bebe52 -> c9d209b02 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/caedc8fd Tree:

cassandra git commit: fix bad merge/rebase

2015-07-15 Thread benedict
Repository: cassandra Updated Branches: refs/heads/trunk 6c14c3af7 - 4cea221f9 fix bad merge/rebase Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4cea221f Tree:

cassandra git commit: fix bad merge

2015-03-18 Thread benedict
Repository: cassandra Updated Branches: refs/heads/trunk 144644bbf - 7bef6f93a 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/7bef6f93 Tree:

cassandra git commit: fix bad merge

2015-02-20 Thread jake
Repository: cassandra Updated Branches: refs/heads/trunk ea3ff25a0 - 9fdbb6559 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/9fdbb655 Tree:

git commit: fix bad merge

2014-04-29 Thread dbrosius
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 bcd14110b - a4664328c 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/a4664328 Tree:

[1/2] git commit: fix bad merge

2014-04-29 Thread dbrosius
Repository: cassandra Updated Branches: refs/heads/trunk 10373762e - 212698501 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/a4664328 Tree:

[3/3] git commit: fix bad merge

2014-04-21 Thread dbrosius
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/30e2bff6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30e2bff6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30e2bff6 Branch:

[4/5] git commit: fix bad merge

2014-04-21 Thread dbrosius
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/30e2bff6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30e2bff6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30e2bff6 Branch:

git commit: Fix bad merge of CASSANDRA-6961 from 2.0 to 2.1

2014-04-08 Thread tylerhobbs
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 1050120c6 - 76db70e9d Fix bad merge of CASSANDRA-6961 from 2.0 to 2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76db70e9 Tree:

[1/2] git commit: Fix bad merge of CASSANDRA-6961 from 2.0 to 2.1

2014-04-08 Thread tylerhobbs
Repository: cassandra Updated Branches: refs/heads/trunk ccef061a2 - f1d5bf136 Fix bad merge of CASSANDRA-6961 from 2.0 to 2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76db70e9 Tree:

git commit: Fix bad merge of 6825 into cassandra-2.1

2014-04-03 Thread tylerhobbs
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 e6e596d1a - 3a51a7e83 Fix bad merge of 6825 into cassandra-2.1 Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-6978 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[1/2] git commit: Fix bad merge of 6825 into cassandra-2.1

2014-04-03 Thread tylerhobbs
Repository: cassandra Updated Branches: refs/heads/trunk 106b43d44 - 345772dd8 Fix bad merge of 6825 into cassandra-2.1 Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-6978 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

git commit: Fix bad merge

2014-02-26 Thread slebresne
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 dc38e4b7d - f145fa496 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/f145fa49 Tree:

[1/2] git commit: Fix bad merge

2014-02-26 Thread slebresne
Repository: cassandra Updated Branches: refs/heads/trunk 8a64f0e03 - 78e7a5d1d 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/f145fa49 Tree:

git commit: Fix bad merge

2014-02-14 Thread aleksey
Updated Branches: refs/heads/trunk 7fddc09b2 - 4b08be49a 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/4b08be49 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b08be49 Diff:

[2/3] git commit: fix bad merge

2014-01-13 Thread brandonwilliams
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: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db69dcee Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db69dcee Branch:

[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:

git commit: fix bad merge

2013-10-17 Thread dbrosius
Updated Branches: refs/heads/cassandra-2.0 229da3725 - f19610c1a 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/f19610c1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f19610c1 Diff:

[1/2] git commit: fix bad merge

2013-10-17 Thread dbrosius
Updated Branches: refs/heads/trunk 78cad84ae - 99c93158d 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/f19610c1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f19610c1 Diff:

git commit: fix bad merge

2013-05-23 Thread jbellis
Updated Branches: refs/heads/trunk 342050fcd - f5cc4760b 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/f5cc4760 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5cc4760 Diff:

git commit: fix bad merge

2013-05-04 Thread marcuse
Updated Branches: refs/heads/trunk ec5f416a4 - 90764b0ac 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/90764b0a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90764b0a Diff:

[1/2] 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:

[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: