]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3780 from ceph/wip-osdc-watch-error
authorJosh Durgin <jdurgin@redhat.com>
Tue, 24 Feb 2015 01:21:04 +0000 (17:21 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Tue, 24 Feb 2015 01:21:04 +0000 (17:21 -0800)
osdc: watch error callback invoked on cancelled context

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

Trivial merge