]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #23640 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 25 Aug 2018 19:50:43 +0000 (12:50 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 25 Aug 2018 19:50:43 +0000 (12:50 -0700)
* refs/pull/23640/head:
mds: use monotonic waits in Beacon

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>

Trivial merge