[2/4] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1.0

2012-04-03 Thread slebresne
Merge branch 'cassandra-1.0' into cassandra-1.1.0 Conflicts: build.xml Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83371ebe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83371ebe Diff: http:/

[2/4] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1.0

2012-03-07 Thread slebresne
Merge branch 'cassandra-1.0' into cassandra-1.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f317575 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f317575 Diff: http://git-wip-us.apache.org/repos/a