Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da457867
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da457867
Diff: http://git-wip-us.apache.org/repos/a
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/45159ae7
Tree: ht
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/055b8964
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/055b8964
Diff: http://git-wip-us.apache.org/repos/a
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/397c0b7c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/397c0b7c
Diff: http://git-wip-us.apache.org/repos/a
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fcd2fc03
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fcd2fc03
Diff: http://git-wip-us.apache.org/repos/a
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51728606
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51728606
Diff: http://git-wip-us.apache.org/repos/a
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dbc45825
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dbc45825
Diff: http://git-wip-us.apache.org/repos/a
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
bin/cassandra-shuffle.bat
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e4415b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e441
Merge branch 'cassandra-2.0' into cassandra-2.1.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/08fd11dc
Tree: http://git-wip-us.apache.or
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5544ecbf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5544ecbf
Diff: http://git-wip-us.apache.org/repos/a
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66577d6c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66577d6c
Diff: http://git-wip-us.apache.org/repos/a
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/821d7a72
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/821d7a72
Diff: http://git-wip-us.apache.org/repos/a
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3c055631
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c055631
Diff: http://git-wip-us.apache.org/repos/a
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5de9c17d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5de9c17d
Diff: http://git-wip-us.apache.org/repos/a
Merge branch 'cassandra-2.0' into cassandra-2.1.0
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/1a9d4b89
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a9d4b89
Diff: http
15 matches
Mail list logo