[2/7] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

2013-03-25 Thread slebresne
Merge branch 'cassandra-1.1' into cassandra-1.2 Conflicts: CHANGES.txt src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/737ef771 Tree:

[2/7] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

2013-01-04 Thread brandonwilliams
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/e4ef4ab3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4ef4ab3 Diff: