From: Sage Weil <sage@redhat.com>
Date: Mon, 11 Jun 2018 21:14:13 +0000 (-0500)
Subject: Merge PR #22501 into master
X-Git-Tag: v14.0.1~1134
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d826f6e8a260a5d1229e8afe323ea815f419df19;p=ceph.git

Merge PR #22501 into master

* refs/pull/22501/head:
	messages/MOSDPGLog: encode epoch for query_epoch for pre-nautilus OSDs

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

d826f6e8a260a5d1229e8afe323ea815f419df19