Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
build.xml
debian/changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b84d06f4
Tree:
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/432b7319
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/432b7319
Diff:
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/629c9a59
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/629c9a59
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/629c9a59
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/191cedfd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/191cedfd
Diff:
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/45968e56
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45968e56
Diff:
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/b181261c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b181261c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b181261c
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/7a1edabd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a1edabd
Diff:
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/3e807b65
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e807b65
Diff:
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/e1059828
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1059828
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1059828
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/2777e1e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2777e1e5
Diff:
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b6913ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b6913ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b6913ee
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
NEWS.txt
src/java/org/apache/cassandra/cql3/QueryProcessor.java
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb7b71f6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb7b71f6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb7b71f6
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/db/compaction/CompactionManager.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab31b217
Tree:
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/bd1a703d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd1a703d
Diff:
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2be42413
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2be42413
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2be42413
Merge branch 'cassandra-1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5754ab2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5754ab2
Diff:
Merge
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/677e247b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/677e247b
Diff:
Merge from 1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5aa781e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5aa781e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5aa781e
Merge branch 'cassandra-1.0' into cassandra-1.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f9454d00
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f9454d00
Diff:
20 matches
Mail list logo