[4/6] git commit: merge from 2.1.0

2014-08-01 Thread jbellis
merge from 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/d33e29ac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d33e29ac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d33e29ac Branc

[4/6] git commit: merge from 2.1.0

2014-07-08 Thread jbellis
merge from 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/f72d0247 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f72d0247 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f72d0247 Branc

[4/6] git commit: merge from 2.1.0

2014-06-27 Thread jbellis
merge from 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/e7dbdd89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7dbdd89 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7dbdd89 Branc