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
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac1d7ee1
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/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/c5f4cdd2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5f4cdd2
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
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/737ef771
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:
Updated Branches:
refs/heads/cassandra-1.2 6caddcd91 - feb7f2934
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:
Updated Branches:
refs/heads/cassandra-1.2 9d0571acf - 88b9d9516
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:
Updated Branches:
refs/heads/cassandra-1.2 42ceccb90 - 0981e9a24
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:
Updated Branches:
refs/heads/cassandra-1.2 0d30c8cea - 361aca59f
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:
Updated Branches:
refs/heads/cassandra-1.2 4b1fca7dc - 858dfefe3
Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
NEWS.txt
build.xml
debian/changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Updated Branches:
refs/heads/cassandra-1.2 5632a56c4 - 7347d968d
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:
Updated Branches:
refs/heads/cassandra-1.2 4c25eef0d - b664c55c3
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:
18 matches
Mail list logo