]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #5776 from wonzhq/tmap-update
authorSage Weil <sage@redhat.com>
Sat, 12 Sep 2015 13:19:20 +0000 (09:19 -0400)
committerSage Weil <sage@redhat.com>
Sat, 12 Sep 2015 13:19:20 +0000 (09:19 -0400)
osd: force promote for ops which ec base pool can't handle

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
1  2 
src/osd/OSD.cc

diff --cc src/osd/OSD.cc
Simple merge