Updated Branches:
refs/heads/trunk 111f6c939 -> 1507ce8cd
Merge branch 'cassandra-1.1' into trunk
Conflicts:
src/java/org/apache/cassandra/io/sstable/Descriptor.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1507ce8c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1507ce8c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1507ce8c
Branch: refs/heads/trunk
Commit: 1507ce8cd4c5c9896a4923d9e0a74d85b6a83184
Parents: 111f6c9 bb37a0f
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Thu Jul 26 18:05:54 2012 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Thu Jul 26 18:05:54 2012 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
