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

Updated Branches: refs/heads/cassandra-1.2 90d2f8e8e -> a878a02fb refs/heads/cassandra-1.2.0 228d1cf6e -> 901a54a6d refs/heads/trunk 1650ae8f6 -> 49db94437 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 a878a02fb -> 4576ccba6 refs/heads/cassandra-1.2.0 901a54a6d -> acda52799 refs/heads/trunk 49db94437 -> ac16a54a1 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 4576ccba6 -> 4208a3f56 refs/heads/cassandra-1.2.0 acda52799 -> 9dffa5736 refs/heads/trunk ac16a54a1 -> 47fb7d534 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 275fae9cf -> 2f3b8d4b3 refs/heads/cassandra-1.2.0 309666b4d -> add2d2db6 refs/heads/trunk db555f7f0 -> 0608330c5 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 1a93de3b3 -> 33ae0908a refs/heads/cassandra-1.2.0 b226ae593 -> 6cdbb2d7b refs/heads/trunk a8e848241 -> 58daf Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 33ae0908a -> 2a41dcd00 refs/heads/cassandra-1.2.0 6cdbb2d7b -> 6e332e340 refs/heads/trunk 58daf -> 192b20875 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 e329c3078 -> efded0046 refs/heads/cassandra-1.2.0 3957df175 -> edf63d8a5 refs/heads/trunk 1a0bc5991 -> 633dbbd7a Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 efded0046 -> c235229e9 refs/heads/cassandra-1.2.0 edf63d8a5 -> 553b9e86d refs/heads/trunk 633dbbd7a -> 44b7b7a62 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 fb577447b -> b960b2b82 refs/heads/cassandra-1.2.0 9366fb323 -> cc166a525 refs/heads/trunk f49ca707d -> 6f5fc0a4b Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 b960b2b82 -> 354cb093d refs/heads/cassandra-1.2.0 cc166a525 -> ad36c8fd8 refs/heads/trunk 6f5fc0a4b -> cf706f26c Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 354cb093d -> c3acf269f refs/heads/cassandra-1.2.0 ad36c8fd8 -> 8c24d019f refs/heads/trunk cf706f26c -> 374359112 Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/db/ColumnFamilyStore.java Project: http://g

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

Updated Branches: refs/heads/cassandra-1.2 c3acf269f -> 42fdf107d refs/heads/cassandra-1.2.0 8c24d019f -> 92f33391e refs/heads/trunk 374359112 -> e0948fc80 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/trunk 26834f0a4 -> 352993e06 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/352993e0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

Updated Branches: refs/heads/cassandra-1.2 21f2094c7 -> 9a58e7e2e refs/heads/cassandra-1.2.0 93738e312 -> 7b4639ab2 refs/heads/trunk d436aed39 -> 555295017 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 b58e1b853 -> d25182f0d refs/heads/cassandra-1.2.0 66026510d -> 0d6990167 refs/heads/trunk b57d25020 -> bb229f25f Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 d25182f0d -> 6bd56cf04 refs/heads/cassandra-1.2.0 0d6990167 -> ffb2eba6c refs/heads/trunk bb229f25f -> a6dd34a0b Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 6bd56cf04 -> 07c6ff1b3 refs/heads/cassandra-1.2.0 ffb2eba6c -> aaf9409f5 refs/heads/trunk a6dd34a0b -> 387b10226 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 07c6ff1b3 -> dfc7b2753 refs/heads/cassandra-1.2.0 aaf9409f5 -> 8a96ec702 refs/heads/trunk 387b10226 -> 513f0a065 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 dfc7b2753 -> 0f7521526 refs/heads/cassandra-1.2.0 8a96ec702 -> 40e22489c refs/heads/trunk 513f0a065 -> 19b96b5da Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 0f7521526 -> dc682de2e refs/heads/cassandra-1.2.0 40e22489c -> 215813157 refs/heads/trunk 19b96b5da -> 47e6f3799 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 4154434cf -> 12948f652 refs/heads/cassandra-1.2.0 a90b310e6 -> 7322f8238 refs/heads/trunk 7fdd4ccbd -> fa9c54ef6 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 32b842b13 -> 8c1683345 refs/heads/cassandra-1.2.0 b537567b3 -> b4f369301 refs/heads/trunk 6c3e437ab -> ef379f280 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/trunk b241bcd08 -> 647ef5aeb 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/647ef5ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

Updated Branches: refs/heads/cassandra-1.2 63c5a9e2b -> a6d4f7a4e refs/heads/cassandra-1.2.0 bc598b5a0 -> d67816bee refs/heads/trunk 02c8e233b -> 77fb2080f Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.2 0207bdf5f -> bebaf453c refs/heads/cassandra-1.2.0 620a4b7a4 -> e7ae7c904 refs/heads/trunk 9bc9853e2 -> 8e7abe0ad Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac