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

Updated Branches: refs/heads/cassandra-1.2 85443ec5c - 3d9d51780 refs/heads/trunk 61a8259d9 - 0c0417d02 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/0c0417d0 Tree:

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

Updated Branches: refs/heads/trunk 8646f9763 - 66b9d114e 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/66b9d114 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 056f38cc1 - e6b6eaa58 refs/heads/trunk 66b9d114e - 8b39a1615 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/8b39a161 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 4df8fdcde - 43c9e8156 refs/heads/trunk 2226e0c94 - 689410b89 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/689410b8 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 43123d1cc - 17adf8e4f refs/heads/trunk 47de14731 - 262fadb27 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/262fadb2 Tree:

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

Updated Branches: refs/heads/trunk 2efeaf3ec - 8cb7bc4af 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/8cb7bc4a Tree:

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

Updated Branches: refs/heads/cassandra-1.2 1108ede0f - 994d2625b refs/heads/trunk acbff934f - edd5caa45 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/edd5caa4 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 526711288 - 2354d62e3 refs/heads/trunk 4f2f97944 - f02bdfeab 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/f02bdfea Tree:

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

Updated Branches: refs/heads/cassandra-1.2 e90dcd51d - 79764f743 refs/heads/trunk 7c77c8415 - 4bab13ec4 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/4bab13ec Tree:

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

Updated Branches: refs/heads/cassandra-1.2 7ca9b6970 - a548f05de refs/heads/trunk cdeb9286f - ce9efef06 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/ce9efef0 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 fac299f8a - 1108ede0f refs/heads/trunk c83110609 - acbff934f 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/acbff934 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 9c320d751 - ec21288db refs/heads/trunk 7196abc39 - ec361ab00 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/ec361ab0 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 ec21288db - 1fac06a84 refs/heads/trunk b153d4564 - 351bc03c6 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/351bc03c Tree:

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

Updated Branches: refs/heads/cassandra-1.2 1fac06a84 - fc0f2472d refs/heads/trunk 351bc03c6 - 009a446b3 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/009a446b Tree:

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

Updated Branches: refs/heads/trunk 1ffdaae24 - 7d539d754 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/7d539d75 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 8349fcebf - 945853076 refs/heads/trunk 549655f28 - 3d1b85817 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/3d1b8581 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 a96a8d41e - 5c8f0994f refs/heads/trunk e33025863 - 985b84692 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/985b8469 Tree:

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

Updated Branches: refs/heads/trunk af404f211 - 95c1ed468 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/95c1ed46 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 9342dddc5 - 4993d427b refs/heads/trunk 0fb9da6fc - 736b2a8e8 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/736b2a8e Tree:

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

Updated Branches: refs/heads/trunk 70e9bed7c - d07735648 Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/cql3/CFPropDefs.java 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 d6a3845a2 - 1d96e32b8 refs/heads/trunk d07735648 - 04ade2ffa 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/04ade2ff Tree:

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

Updated Branches: refs/heads/cassandra-1.2 1d96e32b8 - 8219195d0 refs/heads/trunk 04ade2ffa - e0e45a4fe 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/e0e45a4f Tree:

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

Updated Branches: refs/heads/cassandra-1.2 38757c4b2 - e19cdaa1f refs/heads/trunk e8eb0e689 - f802882c9 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/f802882c Tree:

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

Updated Branches: refs/heads/cassandra-1.2 0888a0cb5 - 26a9ab1f0 refs/heads/trunk 87ae145bb - f0acccd50 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/f0acccd5 Tree:

<    1   2