[1/2] cassandra git commit: Fix merge from CASSANDRA-8359

2015-04-01 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk b09e39295 - 1b0a59e2a Fix merge from CASSANDRA-8359 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ba5f272 Tree:

cassandra git commit: Fix merge from CASSANDRA-8359

2015-04-01 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 52191ebe3 - 0ba5f2721 Fix merge from CASSANDRA-8359 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ba5f272 Tree: