[08/16] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-06-24 Thread brandonwilliams
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/f56ba7ac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f56ba7ac Diff:

[08/16] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-03-19 Thread jbellis
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/dd276ebb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd276ebb Diff: