From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sun, 20 Jan 2019 01:21:09 +0000 (-0800)
Subject: Merge PR #25993 into master
X-Git-Tag: v14.1.0~334
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=53f88b05b83a750120aa2af89a2e9aa569dbef87;p=ceph-ci.git

Merge PR #25993 into master

* refs/pull/25993/head:
	mds/FSMap: simplify encode/decode
	mds: alias reference type for Filesystem
	mds: add missing memory header include
	include/encoding: eliminate smart_ptr temporaries

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

53f88b05b83a750120aa2af89a2e9aa569dbef87