[2/7] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/42a0a46a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42a0a46a Diff: http://git-wip-us.apache.org/repos/a

[2/7] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/706787cf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/706787cf Diff: http://git-wip-us.apache.org/repos/a

[2/7] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

Merge branch 'cassandra-1.1.0' into cassandra-1.1 Conflicts: src/java/org/apache/cassandra/db/ColumnFamilyStore.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2cc612ca Tree: http://git-wip-us.apache.org/

[2/7] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/86d7c844 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86d7c844 Diff: http://git-wip-us.apache.org/repos/a