git commit: Ninja: fix bad merge of CASSANDRA-7804

2014-08-28 Thread tylerhobbs
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 9f208b085 - ed630e30e Ninja: fix bad merge of CASSANDRA-7804 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed630e30 Tree:

[1/2] git commit: Ninja: fix bad merge of CASSANDRA-7804

2014-08-28 Thread tylerhobbs
Repository: cassandra Updated Branches: refs/heads/trunk 21827fac6 - f2f2ee5bc Ninja: fix bad merge of CASSANDRA-7804 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed630e30 Tree: