You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by sc...@apache.org on 2012/02/29 05:33:39 UTC

[1/2] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

Updated Branches:
  refs/heads/cassandra-1.1 087aa3158 -> 15638372a


Merge branch 'cassandra-1.1.0' into cassandra-1.1


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

Branch: refs/heads/cassandra-1.1
Commit: 15638372a404c99f9a5814dfb0e0a2df90f3a611
Parents: 087aa31 3f8db24
Author: Peter Schuller <pe...@infidyne.com>
Authored: Tue Feb 28 12:18:23 2012 -0800
Committer: Peter Schuller <pe...@infidyne.com>
Committed: Tue Feb 28 12:18:23 2012 -0800

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../apache/cassandra/service/StorageService.java   |   10 ++++++++++
 2 files changed, 11 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/15638372/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/15638372/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------