]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #25993 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sun, 20 Jan 2019 01:21:09 +0000 (17:21 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Sun, 20 Jan 2019 01:21:09 +0000 (17:21 -0800)
* 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>
1  2 
src/mon/FSCommands.cc

Simple merge