[4/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

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

[4/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

Merge branch 'cassandra-1.1' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f3c2071 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f3c2071 Diff:

[4/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

Merge branch 'cassandra-1.1' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9d0571ac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d0571ac Diff:

[4/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

Merge branch 'cassandra-1.1' into cassandra-1.2 Conflicts: src/java/org/apache/cassandra/db/HintedHandOffManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d3ef440 Tree:

[4/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

Merge branch 'cassandra-1.1' into cassandra-1.2 Conflicts: src/java/org/apache/cassandra/tools/NodeProbe.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15214fee Tree:

[4/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

Merge branch 'cassandra-1.1' into cassandra-1.2 Conflicts: conf/cassandra.yaml Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1559b497 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1559b497

[4/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

Merge branch 'cassandra-1.1' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4df8fdcd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4df8fdcd Diff:

[4/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

Merge branch 'cassandra-1.1' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43123d1c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43123d1c Diff:

[4/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

Merge branch 'cassandra-1.1' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c320d75 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c320d75 Diff:

[4/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

Merge branch 'cassandra-1.1' into cassandra-1.2 Conflicts: src/java/org/apache/cassandra/thrift/CassandraServer.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/18a1a4b9 Tree:

[4/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

Merge branch 'cassandra-1.1' into cassandra-1.2 Conflicts: src/java/org/apache/cassandra/db/compaction/CompactionTask.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d9510ae Tree:

[4/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

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

[4/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

Merge branch 'cassandra-1.1' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9342dddc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9342dddc Diff:

[4/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

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