]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5f1ac30 d756656)
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)
commit982ced1a295cadfef994cbc9f906a93c3aa35d56
tree44aa6d72c93f8f98bf6ea79cc0636349d705ad34tree | snapshot
parent5f1ac3075caefbba3e5839624a532433a598f9a7commit | diff
parentd756656e2413b0ea708f0ad168ce1bd421f4603dcommit | diff
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 <pdonnell@redhat.com>
Unnamed repository; edit this file 'description' to name the repository.