]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #33117 into master
authorSage Weil <sage@redhat.com>
Sun, 9 Feb 2020 15:40:10 +0000 (09:40 -0600)
committerSage Weil <sage@redhat.com>
Sun, 9 Feb 2020 15:40:10 +0000 (09:40 -0600)
commit0fff7d61b5adecc5cc0d1b88f6696b104b2a9575
treefe145cedf4e3b4946f77e64a0ac5aa85faee9f3e
parent55606809294a46b40a11a64245e06cc17ba74d29
parentcbeb24323aa4d2c1e58e5f18d10f4ec32982c980
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>