From: Loic Dachary <loic@dachary.org>
Date: Mon, 4 May 2015 21:57:48 +0000 (+0200)
Subject: Merge pull request #4499 from dachary/wip-11363-hammer
X-Git-Tag: v0.94.2~35
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4d95929c3129028de2d48efdef71fba2b949edd9;p=ceph.git

Merge pull request #4499 from dachary/wip-11363-hammer

ImageWatcher should cancel in-flight ops on watch error

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

4d95929c3129028de2d48efdef71fba2b949edd9