]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5560680 cbeb243)
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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.