]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #8505 from liewegas/wip-15391
authorSage Weil <sage@redhat.com>
Fri, 15 Apr 2016 21:14:57 +0000 (17:14 -0400)
committerSage Weil <sage@redhat.com>
Fri, 15 Apr 2016 21:14:57 +0000 (17:14 -0400)
osd/ReplicatedPG: make handle_watch_timeout no-op if !active

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/osd/ReplicatedPG.cc

Simple merge