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

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

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

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

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

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