]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7951d8 2516627)
Merge PR #22357 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 15 Jun 2018 14:02:02 +0000 (07:02 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 15 Jun 2018 14:02:02 +0000 (07:02 -0700)
* refs/pull/22357/head:
common/DecayCounter: set last_decay to current time when decoding decay counter

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

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