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

Updated Branches: refs/heads/cassandra-1.1 8d6e43f34 - caeee7c68 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/caeee7c6 Tree:

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

Updated Branches: refs/heads/cassandra-1.1 a1c8dad81 - dafa548fd Merge branch 'cassandra-1.0' into cassandra-1.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/SystemTable.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

Updated Branches: refs/heads/cassandra-1.1 070c1d8dd - ccd436c0f 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:

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

Updated Branches: refs/heads/cassandra-1.1 97620fef3 - 1e7604462 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:

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

Updated Branches: refs/heads/cassandra-1.1 ac8bbb17e - 4ec0990a4 Merge branch 'cassandra-1.0' into cassandra-1.1 Conflicts: src/java/org/apache/cassandra/config/CFMetaData.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

Updated Branches: refs/heads/cassandra-1.1 5cda764a9 - 6b4e5f783 Merge branch 'cassandra-1.0' into cassandra-1.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql/QueryProcessor.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

Updated Branches: refs/heads/cassandra-1.1 5a175336f - ea28f42d7 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/ea28f42d Tree:

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

Updated Branches: refs/heads/cassandra-1.1 1d435db70 - ee2a13546 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: