[2/3] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1

Merge branch 'cassandra-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/d5754ab2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5754ab2 Diff: http://git-wip-us.apache.org/repos/asf

[2/3] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1

Merge branch 'cassandra-1.0' into cassandra-1.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ccd436c0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ccd436c0 Diff: http:/

[2/3] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1

Merge branch 'cassandra-1.0' into cassandra-1.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e760446 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e760446 Diff: http:/

[2/3] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1

Merge branch 'cassandra-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/68268954 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68268954 Diff: http://git-wip-us.apache.org/repos/asf

[2/3] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1

Merge branch 'cassandra-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/c691e09f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c691e09f Diff: http://git-wip-us.apache.org/repos/asf

[2/3] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1

Merge branch 'cassandra-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/d9124ed6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9124ed6 Diff: http://git-wip-us.apache.org/repos/asf

[2/3] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1

Merge branch 'cassandra-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/ee2a1354 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee2a1354 Diff: http://git-wip-us.apache.org/repos/asf