[2/3] git commit: merge from 1.1

2012-11-21 Thread xedin
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1ac6e9f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1ac6e9f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1ac6e9f

[2/3] git commit: merge from 1.1

2012-09-04 Thread xedin
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d90eaf5b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d90eaf5b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d90eaf5b