[2/5] git commit: merge from 2.0

2014-03-12 Thread aleksey
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/6e037824 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e037824 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e037824 Branch:

[2/5] git commit: merge from 2.0

2013-10-08 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/471c2e65 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/471c2e65 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/471c2e65 Branch: