Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0bff5f57
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0bff5f57
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15dfdef0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15dfdef0
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f80d17da
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f80d17da
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f5c8474
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f5c8474
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4ebbae6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4ebbae6
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
CHANGES.txt
NEWS.txt
conf/cassandra.yaml
src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/Directories.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2156fb22
Tree:
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08e7f4c1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08e7f4c1
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25f5afa6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25f5afa6
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/feb7f293
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/feb7f293
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
src/java/org/apache/cassandra/db/SliceFromReadCommand.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88b9d951
Tree:
Merge branch 'cassandra-1.1' into cassandra-1.2
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/0981e9a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0981e9a2
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/361aca59
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/361aca59
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
bin/cqlsh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7347d968
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7347d968
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b664c55c
Tree:
15 matches
Mail list logo