]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #21924 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 15 May 2018 17:10:03 +0000 (10:10 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 15 May 2018 17:10:03 +0000 (10:10 -0700)
* 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 <pdonnell@redhat.com>

Trivial merge