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

Merge pull request #8505 from liewegas/wip-15391

osd/ReplicatedPG: make handle_watch_timeout no-op if !active

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

af45e7760635451ef7cd839c4880afb3dbb74b21