From: Sage Weil <sage@redhat.com>
Date: Sun, 9 Feb 2020 15:40:10 +0000 (-0600)
Subject: Merge PR #33117 into master
X-Git-Tag: v15.1.1~494
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0fff7d61b5adecc5cc0d1b88f6696b104b2a9575;p=ceph.git

Merge PR #33117 into master

* refs/pull/33117/head:
	qa/suites/upgrade/nautilus-x-singleton: ensure hit sets behave across upgrade
	osd/PrimaryLogPG: use legacy timestamp rendering for hit_set objects
	include/utime: allow legacy rendering of timestamp

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

0fff7d61b5adecc5cc0d1b88f6696b104b2a9575