Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
NEWS.txt
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/233308f0
Tree: http://git-wip-
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/service/StorageProxy.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e8aaffa1
Tree: http://git-
Merge branch 'cassandra-1.2' into cassandra-2.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/04ba4623
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04ba4623
Diff: http:/
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/streaming/AbstractStreamSession.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea7d0c82
Tree: http://git-wip-us.ap
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/1e64972b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e64972b
Diff: http://git-wip-us.apache.org/repos/asf
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/8f0952eb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f0952eb
Diff: http://git-wip-us.apache.org/repos/asf
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/e9a57fba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9a57fba
Diff: http://git-wip-us.apache.org/repos/asf
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/e2209d59
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e2209d59
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
NEWS.txt
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/f5526d54
Tree: http://git-wip-us.apache.org/repos/
Merge branch 'cassandra-1.2' into cassandra-2.0
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/cb7eb868
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tre
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/a7b32deb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7b32deb
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/cql3/functions/TimeuuidFcts.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2c84b140
Tree: http://git-wip-us.apache
12 matches
Mail list logo