[2/6] git commit: merge from 1.1.0

2012-04-06 Thread xedin
merge from 1.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be89c8b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be89c8b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be89c8b1 Branc

[2/6] git commit: merge from 1.1.0

2012-02-27 Thread jbellis
merge from 1.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39b50156 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39b50156 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39b50156 Branc