From: Patrick Donnelly Date: Tue, 15 May 2018 17:10:03 +0000 (-0700) Subject: Merge PR #21924 into master X-Git-Tag: v14.0.0~122 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=982ced1a295cadfef994cbc9f906a93c3aa35d56;p=ceph.git Merge PR #21924 into master * refs/pull/21924/head: align lspools output in file-layouts and manual-freebsd-deployment Fixed configuration setting standby_replay Fixed the order of configuration Reviewed-by: Patrick Donnelly --- 982ced1a295cadfef994cbc9f906a93c3aa35d56