]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 574b58f 6f704e3)
Merge branch 'wip-obsync'
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Fri, 27 May 2011 17:59:21 +0000 (10:59 -0700)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Fri, 27 May 2011 17:59:21 +0000 (10:59 -0700)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.