[06/12] git commit: Merge branch 'cassandra-2.1' into trunk

2014-05-20 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/fef40a5a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fef40a5a Diff: http://git-wip-us.apache.org/repos/asf/cassand

[06/12] git commit: Merge branch 'cassandra-2.1' into trunk

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