[3/3] 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/66f0d6b7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66f0d6b7 Diff:

[3/3] 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/2451140b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2451140b Diff:

[3/3] 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/14943766 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14943766 Diff:

[3/3] 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/05d27ea2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05d27ea2 Diff:

[3/3] 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/318b00e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/318b00e2 Diff:

[3/3] 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/369415c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/369415c2 Diff:

[3/3] 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/ef29c82e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef29c82e Diff:

[3/3] 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/f921965a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f921965a Diff:

[3/3] 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/308afb20 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/308afb20 Diff:

[3/3] 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/2130b2e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2130b2e2 Diff:

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

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/db/DeletionTime.java src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java Project:

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

Merge branch 'cassandra-1.2' into trunk 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/283b1a33 Tree:

[3/3] 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/f6fd5bab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6fd5bab Diff:

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

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

[3/3] 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/2ef78c68 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ef78c68 Diff:

[3/3] 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/09d3d2b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09d3d2b8 Diff:

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

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

[3/3] 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/11928f7d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11928f7d Diff:

[3/3] 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/ae26aab4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae26aab4 Diff:

[3/3] 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/3f879076 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f879076 Diff:

[3/3] 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/e4ebd5ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4ebd5ff Diff:

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

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

[3/3] 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/b2eec795 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2eec795 Diff:

[3/3] 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/a90e8b77 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a90e8b77 Diff:

[3/3] 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/b621078f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b621078f Diff:

[3/3] 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/0888c2e1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0888c2e1 Diff:

[3/3] 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/03ff2687 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03ff2687 Diff:

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

Merge branch 'cassandra-1.2' into trunk Conflicts: CHANGES.txt NEWS.txt src/java/org/apache/cassandra/gms/VersionedValue.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1dacd2b6 Tree:

[3/3] 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/2c271e2c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2c271e2c Diff:

[3/3] 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/a684ee09 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a684ee09 Diff:

[3/3] 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/7bb6f012 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bb6f012 Diff:

[3/3] 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/21deff6c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21deff6c Diff:

[3/3] 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/cfc163df Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfc163df Diff:

[3/3] 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/2ca07f52 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ca07f52 Diff:

[3/3] 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/0f09cc5a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f09cc5a Diff:

[3/3] 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/0eb048f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0eb048f2 Diff:

[3/3] 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/db4c27e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db4c27e9 Diff:

[3/3] 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/d78b6226 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d78b6226 Diff:

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

Merge branch 'cassandra-1.2' into trunk Conflicts: bin/cqlsh pylib/cqlshlib/test/test_cqlsh_completion.py pylib/cqlshlib/test/test_cqlsh_output.py Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/tools/NodeCmd.java src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[3/3] 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/34407424 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34407424 Diff:

[3/3] 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/0387cf58 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0387cf58 Diff:

[3/3] 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/0680372d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0680372d Diff:

[3/3] 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/44827b4a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44827b4a Diff:

[3/3] 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/2fc450a0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fc450a0 Diff:

[3/3] 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/c609f27c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c609f27c Diff:

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

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

[3/3] 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/02547747 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02547747 Diff:

[3/3] 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/17410338 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17410338 Diff:

[3/3] 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/03a1fb10 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03a1fb10 Diff:

[3/3] 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/ce6429dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce6429dc Diff:

[3/3] 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/32c3b6e5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32c3b6e5 Diff:

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

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

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

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

[3/3] 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/851fe640 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/851fe640 Diff:

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

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

[3/3] 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/9ee4deb9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ee4deb9 Diff:

[3/3] 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/841ae04f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/841ae04f Diff:

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

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/db/ColumnIndex.java src/java/org/apache/cassandra/io/sstable/SSTableWriter.java test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java Project:

[3/3] 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/0f479eb0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f479eb0 Diff:

[3/3] 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/3d0eb623 Tree:

[3/3] 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/95fc4894 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95fc4894 Diff:

[3/3] 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/1527fabf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1527fabf Diff:

[3/3] 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/e1d60f61 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1d60f61 Diff:

[3/3] 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/17b51691 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17b51691 Diff:

[3/3] 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/5d2d07f5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d2d07f5 Diff:

[3/3] 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/08721da2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08721da2 Diff:

[3/3] 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/35543915 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35543915 Diff:

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

Updated Branches: refs/heads/cassandra-1.2 e4b3d403f - c688125ba refs/heads/trunk c7230f2e2 - b88867ffa 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/b88867ff Tree:

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

Updated Branches: refs/heads/trunk 23da64c81 - c7230f2e2 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/c7230f2e Tree:

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

Updated Branches: refs/heads/trunk e79d9fbf8 - 1c017e0d8 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/1c017e0d Tree:

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

Updated Branches: refs/heads/cassandra-1.2 8d03008c2 - b5f172624 refs/heads/trunk 191296c53 - ba3430cb9 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/ba3430cb Tree:

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

Updated Branches: refs/heads/cassandra-1.2 b5f172624 - 09ee5db73 refs/heads/trunk ba3430cb9 - ff86f3f9a 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/ff86f3f9 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 8261aa083 - 3a3f1d947 refs/heads/trunk 1a473094c - 25a31be4f 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/25a31be4 Tree:

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

Updated Branches: refs/heads/trunk 25a31be4f - 306a565a4 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/306a565a Tree:

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

Updated Branches: refs/heads/cassandra-1.2 500c3f315 - 4b2a9c1b0 refs/heads/trunk e8fa7edc8 - 772540830 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/77254083 Tree:

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

Updated Branches: refs/heads/trunk b096d0bf4 - 7d5490b58 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/7d5490b5 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 457b546e6 - 686f516cc refs/heads/trunk 89e250b8b - 4042ef2dc 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/4042ef2d Tree:

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

Updated Branches: refs/heads/trunk 4042ef2dc - b6062a5ca 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/b6062a5c Tree:

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

Updated Branches: refs/heads/trunk abb94957f - 7fab776f0 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/7fab776f Tree:

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

Updated Branches: refs/heads/cassandra-1.2 3925f5606 - 694e3a74a refs/heads/trunk 7242a0054 - 5673ab3b6 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/5673ab3b Tree:

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

Updated Branches: refs/heads/cassandra-1.2 694e3a74a - 7ff2805c7 refs/heads/trunk 5673ab3b6 - 0411d5a2b 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/0411d5a2 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 7ff2805c7 - bc428351e refs/heads/trunk 0411d5a2b - 8caedfc2c 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/8caedfc2 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 bc428351e - ee0be0624 refs/heads/trunk 8caedfc2c - 12e4c524b 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/12e4c524 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 0b83682b4 - f2a57f04c refs/heads/trunk 36f632c9e - 7049ab44d 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/7049ab44 Tree:

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

Updated Branches: refs/heads/trunk 22609801d - ae87a1f13 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/ae87a1f1 Tree:

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

Updated Branches: refs/heads/trunk 5df067418 - c6204b595 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/c6204b59 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 265964064 - 828572acd refs/heads/trunk c6204b595 - e9777087f 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/e9777087 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 99b3963b7 - 3925f5606 refs/heads/trunk 59af0b9c4 - 7242a0054 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/7242a005 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 d0f7e9e14 - aa7c7d9cd refs/heads/trunk f425c9251 - 06d9bda83 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/06d9bda8 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 aa7c7d9cd - 85cfd383b refs/heads/trunk c1e5b0ffa - 7d81f8cb5 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/7d81f8cb Tree:

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

Updated Branches: refs/heads/trunk aae62a76c - 850440900 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/85044090 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 7347d968d - 6bef66bce refs/heads/trunk 850440900 - 5f36ece0f 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/5f36ece0 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 6bef66bce - 0820b20fb refs/heads/trunk 5f36ece0f - 4e9d01f50 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/4e9d01f5 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 f3091835e - cef8eb07d refs/heads/trunk 95ffb5d2d - ed79a59d9 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/ed79a59d Tree:

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

Updated Branches: refs/heads/cassandra-1.2 7a90c7466 - f3091835e refs/heads/trunk 1f8b9e37f - 95ffb5d2d 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/95ffb5d2 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 b251e7aec - 82de0ec75 refs/heads/trunk 2dd226875 - 6d364f4a3 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/6d364f4a Tree:

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

Updated Branches: refs/heads/cassandra-1.2 82de0ec75 - 75d0f7a3f refs/heads/trunk 58db3ce98 - d216b0d28 Merge branch 'cassandra-1.2' into trunk Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

Updated Branches: refs/heads/cassandra-1.2 aa90c88be - 0d4923f24 refs/heads/trunk f112f992b - d52e12a86 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/d52e12a8 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 f4a941e49 - 7752f018b refs/heads/trunk b7ba0a917 - 34f08529e Merge branch 'cassandra-1.2' into trunk Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

  1   2   >