From: Loic Dachary <loic-redhat@dachary.org>
Date: Thu, 26 Mar 2015 06:58:14 +0000 (+0100)
Subject: Merge pull request #4175 from wonzhq/objecter-timer-2
X-Git-Tag: v0.87.2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=90b37d9bdcc044e26f978632cd68f19ece82d19a;p=ceph.git

Merge pull request #4175 from wonzhq/objecter-timer-2

Objecter: failed assert(tick_event==NULL) at osdc/Objecter.cc

Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

90b37d9bdcc044e26f978632cd68f19ece82d19a