Merge pull request #15432 from dachary/wip-osd-new

author Sage Weil <sage@newdream.net>

Tue, 18 Jul 2017 18:12:51 +0000 (13:12 -0500)

committer GitHub <noreply@github.com>

Tue, 18 Jul 2017 18:12:51 +0000 (13:12 -0500)
author Sage Weil <sage@newdream.net>
Tue, 18 Jul 2017 18:12:51 +0000 (13:12 -0500)
committer GitHub <noreply@github.com>
Tue, 18 Jul 2017 18:12:51 +0000 (13:12 -0500)
diff --cc qa/workunits/ceph-disk/ceph-disk-test.py
Simple merge
diff --cc qa/workunits/ceph-helpers.sh
Simple merge
diff --cc src/ceph-disk/ceph_disk/main.py
Simple merge
diff --cc src/vstart.sh
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 18 Jul 2017 18:12:51 +0000 (13:12 -0500)
committer	GitHub <noreply@github.com>
	Tue, 18 Jul 2017 18:12:51 +0000 (13:12 -0500)
		1	2
qa/workunits/ceph-disk/ceph-disk-test.py	patch \|	diff1 \|	diff2 \|	blob \| history
qa/workunits/ceph-helpers.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/ceph-disk/ceph_disk/main.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/vstart.sh	patch \|	diff1 \|	diff2 \|	blob \| history