]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50de222 7af0243)
Merge PR #29818 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 26 Sep 2019 13:25:17 +0000 (06:25 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 26 Sep 2019 13:25:17 +0000 (06:25 -0700)
* refs/pull/29818/head:
client/MetaRequest: Add age to MetaRequest dump
osdc/Objecter: Add age to the ops
common/ceph_time: Use fixed floating-point notation for mono_clock

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

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