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

2014-10-30 Thread brandonwilliams
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c4c9303d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4c9303d Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-07-09 Thread jake
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2500951e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2500951e Diff: http://git-wip-us.apache.org/repos/asf/cassand