]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47145d8 5d5a42b)
Merge remote-tracking branch 'gh/wip-scrub' into next
authorSage Weil <sage@inktank.com>
Fri, 21 Dec 2012 21:56:16 +0000 (13:56 -0800)
committerSage Weil <sage@inktank.com>
Fri, 21 Dec 2012 21:56:16 +0000 (13:56 -0800)

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