Merge branch 'cassandra-2.1.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/7d84043e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d84043e
Diff:
Merge branch 'cassandra-2.1.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/a15e11ab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a15e11ab
Diff:
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/b3bb7fcc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3bb7fcc
Diff:
Merge branch 'cassandra-2.1.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/6b47853d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b47853d
Diff:
Merge branch 'cassandra-2.1.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/3b14f6a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b14f6a5
Diff:
Merge branch 'cassandra-2.1.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/367a3696
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/367a3696
Diff:
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/a9da3fda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9da3fda
Diff:
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/86cd4234
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86cd4234
Diff:
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
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/b6224118
Tree:
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/45a6373e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45a6373e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45a6373e
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e0718bcd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0718bcd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0718bcd
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e101bef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e101bef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e101bef
merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58014d30
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58014d30
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58014d30
Branch:
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/7bde2454
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bde2454
Diff:
Merge branch 'cassandra-2.0.0' 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/23becceb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23becceb
Diff:
Merge branch '3886' into cassandra-1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb0efd09
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb0efd09
Diff:
16 matches
Mail list logo