[11/12] git commit: merge from 2.0

2014-03-26 Thread jbellis
merge from 2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/45a6373e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45a6373e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45a6373e

[11/12] git commit: merge from 2.0

2014-03-14 Thread jbellis
merge from 2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e0718bcd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0718bcd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0718bcd

[11/12] git commit: merge from 2.0

2014-02-19 Thread jbellis
merge from 2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e101bef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e101bef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e101bef