From: Sage Weil <sage@redhat.com>
Date: Thu, 31 Mar 2016 05:08:01 +0000 (-0400)
Subject: Merge pull request #8369 from xiexingguo/xxg-wip-tick
X-Git-Tag: v10.1.1~46
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6736341fcd4d77d6b23cf45daa61ce862a6444e4;p=ceph.git

Merge pull request #8369 from xiexingguo/xxg-wip-tick

osd: fix tick relevant issues

Reviewed-by: Sage Weil <sage@redhat.com>
---

6736341fcd4d77d6b23cf45daa61ce862a6444e4