]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #24874 into master
authorSage Weil <sage@redhat.com>
Mon, 19 Nov 2018 23:31:17 +0000 (17:31 -0600)
committerSage Weil <sage@redhat.com>
Mon, 19 Nov 2018 23:31:19 +0000 (17:31 -0600)
* 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>
1  2 
.githubmap
src/os/filestore/FileStore.cc

diff --cc .githubmap
index 4c2d41a82119e07d137d60499cb2e2bbe79080fb,4c2d41a82119e07d137d60499cb2e2bbe79080fb..a0aecda1a3b0159492ebdac92fc6d41d7cc24dd9
@@@ -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>
Simple merge