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

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

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

2014-01-31 Thread brandonwilliams
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/d76ad2e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d76ad2e2 Diff:

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

2013-10-22 Thread brandonwilliams
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/8a069587 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a069587 Diff:

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

2013-09-11 Thread brandonwilliams
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f117da0 Tree: