]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a1068e1 328ab2d)
Merge PR #25308 into master
authorSage Weil <sage@redhat.com>
Fri, 30 Nov 2018 19:19:42 +0000 (13:19 -0600)
committerSage Weil <sage@redhat.com>
Fri, 30 Nov 2018 19:19:42 +0000 (13:19 -0600)
commit5f7e083678378722c72e61b1ec01367c15adb671
tree00ba0023860f5164c3884039c469af7eef47e075tree | snapshot
parenta1068e126dac38725aee95619a5b0d4dd3c566e2commit | diff
parent328ab2d9f0a27aa38d153469f8ed11e21a6c3ae8commit | diff
Merge PR #25308 into master

* refs/pull/25308/head:
osd/OSD: OSD::mkfs asserts when reusing disk with existing superblock.
os/bluestore: add main device expand capability.

Reviewed-by: Sage Weil <sage@redhat.com>
src/os/bluestore/BlueStore.cc diff1 | diff2 | blob | history
src/osd/OSD.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.