subject:"\[6\/9\] git commit\: Merge branch 'cassandra\-1.2' into cassandra\-2.0"

[6/9] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-04-02 Thread brandonwilliams

Merge branch 'cassandra-1.2' into cassandra-2.0 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/05b2ae84 Tree:

[6/9] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-03-24 Thread yukim

Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e6c8034b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6c8034b Diff:

[6/9] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-02-17 Thread yukim

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/service/AntiEntropyService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b50b2b2 Tree: