From: Kefu Chai <tchaikov@gmail.com>
Date: Wed, 30 Aug 2017 05:44:50 +0000 (+0800)
Subject: Merge pull request #16357 from Blackclaws/master
X-Git-Tag: v13.0.1~1115
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a5198678c5cdbb7a9f1ca56b89d0450b0cb42938;p=ceph.git

Merge pull request #16357 from Blackclaws/master

ceph-disk activate unlocks bluestore data partition

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

a5198678c5cdbb7a9f1ca56b89d0450b0cb42938
diff --cc src/ceph-disk/ceph_disk/main.py
index 8b0c5dbc389,0e4aaaa23f6..5a0a2b61ecf
mode 100755,100644..100644
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py