From: Sage Weil <sage@redhat.com>
Date: Mon, 19 Nov 2018 23:31:17 +0000 (-0600)
Subject: Merge PR #24874 into master
X-Git-Tag: v14.1.0~873
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=38e95b2d8a40df264ea685ad528f89c78e01da0c;p=ceph.git

Merge PR #24874 into master

* refs/pull/24874/head:
	os/filestore: collect partition/device metadata from journal
	os/filestore: include journal in get_devices result

Reviewed-by: Rick Chen <rick.chen@prophetstor.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
---

38e95b2d8a40df264ea685ad528f89c78e01da0c
diff --cc .githubmap
index 4c2d41a82119,4c2d41a82119..a0aecda1a3b0
--- a/.githubmap
+++ b/.githubmap
@@@ -89,3 -89,3 +89,4 @@@ dillaman Jason Dillaman <dillaman@redha
  batrick Patrick Donnelly <pdonnell@redhat.com>
  noahdesu Noah Watkins <nwatkins@redhat.com>
  tserong Tim Serong <tserong@suse.com>
++hsiang41 Rick Chen <rick.chen@prophetstor.com>