From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 15 Jun 2018 14:02:02 +0000 (-0700)
Subject: Merge PR #22357 into master
X-Git-Tag: v14.0.1~1104
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a3f8a14bbb1f6c4be06badff498cfd9f2cf0495;p=ceph.git

Merge PR #22357 into master

* refs/pull/22357/head:
	common/DecayCounter: set last_decay to current time when decoding decay counter

Reviewed-by: Zheng Yan <zyan@redhat.com>
---

9a3f8a14bbb1f6c4be06badff498cfd9f2cf0495