Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aac421aa
Tree:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/afd63687
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/afd63687
Diff:
Merge branch 'cassandra-2.0' into trunk
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/67101c29
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67101c29
Diff:
Merge branch 'cassandra-2.0' into trunk
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/58d1a4f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58d1a4f8
Diff:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4e9d1aca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e9d1aca
Diff:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8ebeee10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ebeee10
Diff:
Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed6584ee
Tree:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6635cde3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6635cde3
Diff:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c41eedf2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c41eedf2
Diff:
Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/tools/SSTableImport.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bfd0144a
Tree:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfcc5757
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfcc5757
Diff:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b0c9e41
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b0c9e41
Diff:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e0aa710
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e0aa710
Diff:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/10c60f5a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10c60f5a
Diff:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b89cce9c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b89cce9c
Diff:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3da10f46
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3da10f46
Diff:
Merge branch 'cassandra-2.0' into trunk
Conflicts:
NEWS.txt
build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4fb09048
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4fb09048
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54f41a9f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54f41a9f
Diff:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/241f7a45
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/241f7a45
Diff:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e01186c2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e01186c2
Diff:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bc0f599
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bc0f599
Diff:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43105f7f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43105f7f
Diff:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99b50404
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99b50404
Diff:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/883ed60e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/883ed60e
Diff:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f243a91
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f243a91
Diff:
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0dd3438a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0dd3438a
Diff:
26 matches
Mail list logo