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

[1/4] git commit: Merge branch 'cassandra-1.0' into trunk

Updated Branches:
  refs/heads/trunk b3a378c02 -> cfd9399dc


Merge branch 'cassandra-1.0' into trunk


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

Branch: refs/heads/trunk
Commit: cfd9399dce96127c868b35fcc91dcd8514165b41
Parents: b3a378c cafeeeb
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jan 12 10:58:34 2012 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jan 12 10:58:34 2012 -0600

----------------------------------------------------------------------
 NEWS.txt                                           |   14 +++++++-------
 .../apache/cassandra/db/HintedHandOffManager.java  |    4 ++--
 src/java/org/apache/cassandra/db/SystemTable.java  |    2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfd9399d/NEWS.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfd9399d/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------