[5/5] git commit: Merge branch 'cassandra-1.2' into trunk

[brandonwilliams]

Updated Branches:
  refs/heads/cassandra-1.2 6a7a28852 -> 1fc218ff7
  refs/heads/trunk f8fd16922 -> bcabea730


Merge branch 'cassandra-1.2' into trunk

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/bcabea73
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcabea73
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcabea73

Branch: refs/heads/trunk
Commit: bcabea7307c3d76d35a66a23b13ee40c8d90c015
Parents: f8fd169 1fc218f
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Tue Mar 19 15:50:44 2013 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Tue Mar 19 15:50:44 2013 -0500

----------------------------------------------------------------------
 .../cassandra/db/commitlog/CommitLogSegment.java   |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcabea73/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
----------------------------------------------------------------------