]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #22501 into master
authorSage Weil <sage@redhat.com>
Mon, 11 Jun 2018 21:14:13 +0000 (16:14 -0500)
committerSage Weil <sage@redhat.com>
Mon, 11 Jun 2018 21:14:13 +0000 (16:14 -0500)
* refs/pull/22501/head:
messages/MOSDPGLog: encode epoch for query_epoch for pre-nautilus OSDs

Reviewed-by: Kefu Chai <kchai@redhat.com>

Trivial merge