[1/8] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.0 373e5b0d5 -> 73f479c28 refs/heads/cassandra-1.1 d401d9f1d -> 239d66f14 refs/heads/trunk 5225ed944 -> bdc9a158e Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

[1/8] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.0 48438ffc6 -> 641b021d3 refs/heads/cassandra-1.1 7c2e49e22 -> 500c1c01c refs/heads/trunk c553d608f -> 3fd08ddfb Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

[1/8] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.0 2db61ab9e -> 48438ffc6 refs/heads/cassandra-1.1 39dd85501 -> 7c2e49e22 refs/heads/trunk 9bf0386b6 -> c553d608f Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

[1/8] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 d34865bc9 -> 057ea8620 refs/heads/trunk a14f08b5f -> b4d6d5159 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4d6d515 Tree: htt

[1/8] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.0 c73881309 -> f08051194 refs/heads/cassandra-1.1 3f8372c1f -> 211bc0ca3 refs/heads/trunk 95c105ba2 -> 3699a2de0 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

[1/8] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/trunk 3f7c7323b -> 38515b19a Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java src/java/or

[1/8] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.0 bc05b5960 -> 53fb52ac7 refs/heads/trunk a3c07ee41 -> 5f60deeef Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f60deee Tree: htt

[1/8] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/trunk 08e37bde6 -> eb68247c9 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb68247c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[1/8] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.0 63da8815a -> d9ed03787 refs/heads/cassandra-1.1 6c70b83d0 -> 1176d9f3a refs/heads/trunk c3237e474 -> 9b98a Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

[1/8] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 fdd3721fb -> 0f3ff051e refs/heads/trunk 07f39e8ec -> 8fa285c8b Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8fa285c8 Tree: htt

[1/8] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 e36b2130f -> 4f4aa4fb9 refs/heads/trunk 76736edc6 -> 92813d9f0 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92813d9f Tree: htt