]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #26591 into master
authorSage Weil <sage@redhat.com>
Mon, 25 Feb 2019 14:43:40 +0000 (08:43 -0600)
committerSage Weil <sage@redhat.com>
Mon, 25 Feb 2019 14:43:40 +0000 (08:43 -0600)
* refs/pull/26591/head:
osd/PrimaryLogPG: handle object !exists in handle_watch_timeout

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Trivial merge