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

Updated Branches: refs/heads/trunk 38a1e7e92 - 1e7100148 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/1e710014 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 fca00acb5 - 0207bdf5f refs/heads/trunk d3cd9adf9 - 9bc9853e2 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/9bc9853e Tree:

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

Updated Branches: refs/heads/cassandra-1.2 bebaf453c - de2495c2c refs/heads/trunk 8e7abe0ad - ff92111c0 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/ff92111c Tree:

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

Updated Branches: refs/heads/cassandra-1.2 f25284220 - 4e3d04915 refs/heads/trunk 1e80bb899 - dd14505f1 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/dd14505f Tree:

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

Updated Branches: refs/heads/trunk ace2258eb - 02c8e233b 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/02c8e233 Tree:

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

Updated Branches: refs/heads/trunk b5d07e582 - df1df221e 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:

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

Updated Branches: refs/heads/trunk 120bf9f14 - ace2258eb 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/ace2258e Tree:

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

Updated Branches: refs/heads/cassandra-1.2 40762aec0 - 158376963 refs/heads/trunk 32ad73bcd - d173ab51a 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/d173ab51 Tree:

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

Updated Branches: refs/heads/trunk bd572d7d9 - 65bd017fc 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/65bd017f Tree:

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

Updated Branches: refs/heads/trunk 65bd017fc - 32ad73bcd 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/32ad73bc Tree:

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

Updated Branches: refs/heads/cassandra-1.2 2d3ee8000 - 31ba28909 refs/heads/trunk f7359466a - 5363189f9 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/5363189f Tree:

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

Updated Branches: refs/heads/cassandra-1.2 31ba28909 - db9eb04e2 refs/heads/trunk 5363189f9 - bd572d7d9 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/bd572d7d Tree:

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

Updated Branches: refs/heads/trunk eb1e1b0d4 - ea4f28505 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/ea4f2850 Tree:

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

Updated Branches: refs/heads/trunk 69e6c0b8b - 10a65b2df 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/10a65b2d Tree:

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

Updated Branches: refs/heads/trunk 7cb254125 - 8b08dd17f 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/8b08dd17 Tree:

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

Updated Branches: refs/heads/trunk e55740885 - ab1078178 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/ab107817 Tree:

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

Updated Branches: refs/heads/trunk ab1078178 - eb1e1b0d4 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/eb1e1b0d Tree:

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

Updated Branches: refs/heads/trunk 989dd44c0 - 7fdd4ccbd 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/7fdd4ccb Tree:

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

Updated Branches: refs/heads/trunk e4d5d3393 - ec53d61cd 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/ec53d61c Tree:

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

Updated Branches: refs/heads/trunk 9c0a1986a - be3a22906 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/be3a2290 Tree:

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

Updated Branches: refs/heads/trunk 298606afd - 86447b7df 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/86447b7d Tree:

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

Updated Branches: refs/heads/trunk 86447b7df - e15664d08 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/e15664d0 Tree:

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

Updated Branches: refs/heads/trunk e15664d08 - 6a0d02c76 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/6a0d02c7 Tree:

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

Updated Branches: refs/heads/trunk 6a0d02c76 - 3bd353f91 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/3bd353f9 Tree:

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

Updated Branches: refs/heads/trunk 3bd353f91 - f49ca707d 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/f49ca707 Tree:

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

Updated Branches: refs/heads/trunk f02ee5412 - 8d4825402 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/8d482540 Tree:

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

Updated Branches: refs/heads/trunk 192b20875 - 408b468fa 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/408b468f Tree:

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

Updated Branches: refs/heads/trunk 7b0b27c52 - 949529af4 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/949529af Tree:

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

Updated Branches: refs/heads/trunk 949529af4 - 567928f5f 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/567928f5 Tree:

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

Updated Branches: refs/heads/trunk 0608330c5 - 69accb311 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/69accb31 Tree:

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

Updated Branches: refs/heads/trunk 85cd442e7 - 147ff63fa 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/147ff63f Tree:

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

Updated Branches: refs/heads/trunk 2548ab590 - 191c96f1d 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/191c96f1 Tree:

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

Updated Branches: refs/heads/trunk 47fb7d534 - e7e3d3e60 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/e7e3d3e6 Tree:

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

Updated Branches: refs/heads/trunk e7e3d3e60 - cee521477 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/cee52147 Tree: