From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Apr 2016 21:08:49 +0000 (-0400)
Subject: Merge pull request #8586 from liewegas/wip-15441
X-Git-Tag: v10.2.0~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0eab58014b5469693ae01d23d387cfa043e9c91e;p=ceph.git

Merge pull request #8586 from liewegas/wip-15441

osd: fix watch reconnect race

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Samuel Just <sjust@redhat.com>
---

0eab58014b5469693ae01d23d387cfa043e9c91e