]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3fee99e 18054ba)
Merge branch 'wip-rbd-protect-merge'
authorJosh Durgin <josh.durgin@inktank.com>
Thu, 16 Aug 2012 20:00:03 +0000 (13:00 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Thu, 16 Aug 2012 20:00:26 +0000 (13:00 -0700)

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