From: Sage Weil <sage@redhat.com>
Date: Sat, 12 Sep 2015 13:23:13 +0000 (-0400)
Subject: Merge pull request #5892 from ceph/wip-13060-hammer
X-Git-Tag: v0.94.4~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f35c53df7c155d7ff4a316a0817b11bc018c57ca;p=ceph.git

Merge pull request #5892 from ceph/wip-13060-hammer

osd: allow peek_map_epoch to return an error

Reviewed-by: David Zafman <dzafman@redhat.com>
---

f35c53df7c155d7ff4a316a0817b11bc018c57ca