]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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>
1  2 
src/os/bluestore/BlueStore.cc patch | diff1 | diff2 | blob | history
src/osd/OSD.cc patch | diff1 | diff2 | blob | history

diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.