You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/02/01 20:27:06 UTC

[1/16] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches:
  refs/heads/cassandra-1.1 be8373c15 -> 000078efc
  refs/heads/trunk 815fcb509 -> d870d1755


Merge branch 'cassandra-1.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d870d175
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d870d175
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d870d175

Branch: refs/heads/trunk
Commit: d870d17556911fb811a2abb92c9885e599bc014c
Parents: 815fcb5 000078e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 1 13:26:12 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 1 13:26:12 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |   15 +++++++++++++++
 .../apache/cassandra/db/commitlog/CommitLog.java   |    3 ++-
 2 files changed, 17 insertions(+), 1 deletions(-)
----------------------------------------------------------------------