[13/16] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-06-24 Thread brandonwilliams
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc20907b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc20907b Diff: http://git-wip-us.apache.org/repos/asf

[13/16] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-03-19 Thread jbellis
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e366e3b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e366e3b Diff: http://git-wip-us.apache.org/repos/asf