[05/12] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-09-05 Thread yukim
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/service/StorageService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dea5fa78 Tree: http://git-wip-us.apache.org/

[05/12] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-05-20 Thread brandonwilliams
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57fa76fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57fa76fd Diff: http://git-wip-us.apache.org/repos/asf