[3/3] cassandra git commit: merge from 2.1

2015-04-14 Thread jbellis
merge from 2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c74f2252 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c74f2252 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c74f2252

[3/3] cassandra git commit: merge from 2.1

2015-02-09 Thread jbellis
merge from 2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aec423bc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aec423bc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aec423bc

[3/3] cassandra git commit: merge from 2.1

2014-12-05 Thread jbellis
merge from 2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ff4b5e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ff4b5e9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ff4b5e9