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

Updated Branches: refs/heads/trunk cee521477 - 40599fe4d 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/40599fe4 Tree:

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

Updated Branches: refs/heads/trunk 563417451 - a007e1b5f 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/a007e1b5 Tree:

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

Updated Branches: refs/heads/trunk 9e60586d6 - 563417451 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/56341745 Tree: