[3/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-28 Thread tylerhobbs
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8be49b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8be49b5 Diff: http://git-wip-us.apache.org/repos/a

[3/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-06-30 Thread jbellis
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d714d631 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d714d631 Diff: http://git-wip-us.apache.org/repos/a