[8/9] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-08-06 Thread brandonwilliams
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7fc89ad7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fc89ad7 Diff:

[8/9] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-06-19 Thread yukim
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/service/StorageService.java src/java/org/apache/cassandra/tools/NodeCmd.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[8/9] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-05-28 Thread jbellis
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/4a652565 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a652565 Diff:

[8/9] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-04-02 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/c749b88e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c749b88e Diff:

[8/9] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-03-25 Thread jbellis
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/0cd17695 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cd17695 Diff:

[8/9] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-03-24 Thread yukim
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/874a3417 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/874a3417 Diff:

[8/9] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-02-17 Thread yukim
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/c9a4bffe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9a4bffe Diff: