Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b44bbb83
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b44bbb83
Diff:
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cee1f674
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cee1f674
Diff: