]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #8586 from liewegas/wip-15441
authorSage Weil <sage@redhat.com>
Fri, 15 Apr 2016 21:08:49 +0000 (17:08 -0400)
committerSage Weil <sage@redhat.com>
Fri, 15 Apr 2016 21:08:49 +0000 (17:08 -0400)
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>

Trivial merge