]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 796331d 2da9449)
Merge branch 'wip-scrub-repair' of git://github.com/ukernel/ceph into greg-fs-testing
authorGreg Farnum <gfarnum@redhat.com>
Tue, 8 Mar 2016 00:19:39 +0000 (16:19 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Tue, 8 Mar 2016 00:19:39 +0000 (16:19 -0800)
https://github.com/ceph/ceph/pull/6682

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>

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