]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #5892 from ceph/wip-13060-hammer
authorSage Weil <sage@redhat.com>
Sat, 12 Sep 2015 13:23:13 +0000 (09:23 -0400)
committerSage Weil <sage@redhat.com>
Sat, 12 Sep 2015 13:23:13 +0000 (09:23 -0400)
osd: allow peek_map_epoch to return an error

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

Trivial merge