From: Sage Weil <sage@redhat.com>
Date: Tue, 8 Oct 2019 15:11:56 +0000 (-0500)
Subject: Merge PR #30788 into master
X-Git-Tag: v15.1.0~1309
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=37e2e76fa8deb95cccd0d5ec2dfba5808039d322;p=ceph.git

Merge PR #30788 into master

* refs/pull/30788/head:
	Revert "ceph-volume: accept --no-tmpfs argument for bluestore"
	Revert "ceph-volume: no_tmpfs -> tmpfs"

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
---

37e2e76fa8deb95cccd0d5ec2dfba5808039d322
diff --cc .githubmap
index 3bbdc3d3aad0,3bbdc3d3aad0..73322d385cd2
--- a/.githubmap
+++ b/.githubmap
@@@ -103,3 -103,3 +103,4 @@@ BlaineEXE Blaine Gardner <bgardner@suse
  travisn Travis Nielsen <tnielsen@redhat.com>
  sidharthanup Sidharth Anupkrishnan <sanupkri@redhat.com>
  varshar16 Varsha Rao <varao@redhat.com>
++guits Guillaume Abrioux <gabrioux@redhat.com>