From: Josh Durgin <jdurgin@redhat.com>
Date: Tue, 24 Feb 2015 01:21:04 +0000 (-0800)
Subject: Merge pull request #3780 from ceph/wip-osdc-watch-error
X-Git-Tag: v0.93~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c1c38afcf9ef220baa7a127de3ea93c98aff0c73;p=ceph.git

Merge pull request #3780 from ceph/wip-osdc-watch-error

osdc: watch error callback invoked on cancelled context

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

c1c38afcf9ef220baa7a127de3ea93c98aff0c73