From: Greg Farnum <gfarnum@redhat.com>
Date: Tue, 8 Mar 2016 00:19:39 +0000 (-0800)
Subject: Merge branch 'wip-scrub-repair' of git://github.com/ukernel/ceph into greg-fs-testing
X-Git-Tag: v10.1.0~176^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=976358111d6d072ceacc43bada465d07fc887fe2;p=ceph.git

Merge branch 'wip-scrub-repair' of git://github.com/ukernel/ceph into greg-fs-testing

https://github.com/ceph/ceph/pull/6682

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

976358111d6d072ceacc43bada465d07fc887fe2