[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1302263c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1302263c Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/service/MigrationManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25c9293f Tree: http://git-wip-us.apache.org/repos/

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/98214bb6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98214bb6 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be8c9abf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be8c9abf Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: NEWS.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ab0db29 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ab0db29 Diff: http://git-wip-us

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: CHANGES.txt src/java/org/apache/cassandra/tools/NodeCmd.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e01c238f Tree: http://git-wip-us.apache.o

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8c795372 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c795372 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e22025e0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e22025e0 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: doc/cql3/CQL.textile src/java/org/apache/cassandra/cql3/QueryProcessor.java src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java src/java/org/apache/cassandra/cql3/statements/SelectStatement.java

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: CHANGES.txt bin/cqlsh Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/885b5dac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/885b5dac Di

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/cql3/Constants.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/80717655 Tree: http://git-wip-us.apache.org/repos/asf/cassan

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/cql3/Constants.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c00c24cb Tree: http://git-wip-us.apache.org/repos/asf/cassan

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' 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/7b841aad Tree: http://git-wip-us.apache.org

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5e469ea7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e469ea7 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/abea32e1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/abea32e1 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/config/CFMetaData.java src/java/org/apache/cassandra/config/ColumnDefinition.java src/java/org/apache/cassandra/config/KSMetaData.java src/java/org/apache/cassandra/cql3/statements/Dele

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7049056 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7049056 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f72229d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f72229d Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk 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/c4c04e78 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4c04e78 Diff: http://git-wip-u

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/config/DatabaseDescriptor.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6043812a Tree: http://git-wip-us.apache.org/repos

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd85daf8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd85daf8 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk 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/3828cc51 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3828cc51 Diff: http://git-wip-u

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4df6c287 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4df6c287 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5e70405e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e70405e Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql3/QueryProcessor.java src/java/org/apache/cassandra/cql3/statements/SelectStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-u

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e73163c5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e73163c5 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36a66139 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36a66139 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/377da747 Tree: http://git-wip-us.apache.org/repos/

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c0ca5d6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c0ca5d6 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java test/unit/org/apache/cassandra/db/RangeTombstoneTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1f10f82 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1f10f82 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/net/OutboundTcpConnection.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4cda3622 Tree: http://git-wip-us.apache.org/repos

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/753dc992 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/753dc992 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: pylib/cqlshlib/helptopics.py Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6258c58c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6258c58c Dif

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' 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/a78cd545 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a78cd545 Diff: http://git-wip

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2feb81ea Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2feb81ea Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8df9d1f4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8df9d1f4 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1daa8e4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1daa8e4f Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89e792fc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89e792fc Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b908c0a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b908c0a Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee0f495f Tree: http://git-wip-us.apache.org

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: bin/cqlsh doc/cql3/CQL.textile src/java/org/apache/cassandra/cql3/QueryProcessor.java src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/093e188a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/093e188a Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66a5e09b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66a5e09b Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d0042343 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d0042343 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47d5f124 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47d5f124 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql3/Constants.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/84d1aaae Tree: http://git-wip-us.apache.

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68fa88d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68fa88d1 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6da1cbbc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6da1cbbc Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1332890 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1332890 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b9f1e2b Tree: http://git-wip-us.apach

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/523e6837 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/523e6837 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk 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/ccc87fb3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ccc87fb3 Diff: http://git-wip-u

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d1e29bd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d1e29bd Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/992d31f4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/992d31f4 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dbf50505 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dbf50505 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: test/system/test_thrift_server.py Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37f0c8c9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37f0c8c

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: tools/stress/src/org/apache/cassandra/stress/StressAction.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be0523a2 Tree: http://git-wip-us.apache.org/rep

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58910796 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58910796 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d27cc88 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d27cc88 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' 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/0d5ed281 Tree: http://git-wip-us.apac

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bac41da6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bac41da6 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/db/BatchlogManager.java src/java/org/apache/cassandra/db/RowMutation.java src/java/org/apache/cassandra/service/StorageProxy.java test/unit/org/apache/cassandra/db/HintedHandOffTest.jav

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: CHANGES.txt src/java/org/apache/cassandra/config/CFMetaData.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/405c2515 Tree: http://git-wip-us.apac

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3683d621 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3683d621 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49a7311f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49a7311f Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aecd6301 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aecd6301 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: NEWS.txt doc/cql3/CQL.textile src/java/org/apache/cassandra/cql3/Cql.g src/java/org/apache/cassandra/cql3/QueryProcessor.java src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java Project

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3301a6bf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3301a6bf Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a5495af Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a5495af Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a45918b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a45918b0 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/config/CFMetaData.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9eef9e47 Tree: http://git-wip-us.apache.org/repos/asf/cas

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1c7c132 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1c7c132 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3c7baf35 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c7baf35 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/net/OutboundTcpConnection.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/317dca58 Tree: http://git-wip-us.apache.org/repos

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/io/sstable/Descriptor.java test/unit/org/apache/cassandra/streaming/BootstrapTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/ca

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/116d9076 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/116d9076 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/db/ColumnFamily.java src/java/org/apache/cassandra/db/RowIndexEntry.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc7c549e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc7c549e Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e269cf11 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e269cf11 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52443c80 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52443c80 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk 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/71e764cb Tree: http://git-wip-us.apache.org/

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e37ca25c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e37ca25c Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da2b7d3a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da2b7d3a Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/cql/QueryProcessor.java src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java src/java/org/apache/cassandra/db/RetriedSliceFromReadCommand.java src/java/org/apache/ca

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/db/BatchlogManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4063bcc8 Tree: http://git-wip-us.apache.org/repos/asf/ca

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/493fccd1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/493fccd1 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2a949ec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2a949ec Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7005a780 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7005a780 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c348c42 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c348c42 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6106a18 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6106a18 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c47f4070 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c47f4070 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/db/HintedHandOffManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/076a0e4e Tree: http://git-wip-us.apache.org/repos/a

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Updated Branches: refs/heads/trunk 2e63d096c -> 3254dbaeb Merge branch 'cassandra-1.2' 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/3254dbae Tree: http://git-wip-us.apa

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Updated Branches: refs/heads/trunk fd1f5fd08 -> 346ac0c64 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/346ac0c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Updated Branches: refs/heads/trunk b88867ffa -> cfbcd98e0 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfbcd98e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Updated Branches: refs/heads/trunk ff86f3f9a -> 23da64c81 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23da64c8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Updated Branches: refs/heads/trunk 13e0c6357 -> 191296c53 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/191296c5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Updated Branches: refs/heads/trunk c65f9e7ed -> 13e0c6357 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/13e0c635 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Updated Branches: refs/heads/trunk fb833b320 -> 62ff2942a Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/62ff2942 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

  1   2   >