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

2012-04-05 Thread brandonwilliams
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/6e10da08 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e10da08 Diff: http://git-wip-us.apache.org/repos/a

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

2012-03-13 Thread slebresne
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Conflicts: CHANGES.txt NEWS.txt src/java/org/apache/cassandra/config/KSMetaData.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/073038c8 T