]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commitf35c53df7c155d7ff4a316a0817b11bc018c57ca
tree4e9a9f91472c45bfa1b746ec85637e7450e9941f
parent6e22620165872a88ab4b75ed2fb93f61beb65d12
parent4be8a28d5b5ba868d100300ab64ebb82b188222b
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>