git-server-git.apps.pok.os.sepia.ceph.com Git

author	Wido den Hollander <wido@42on.com>
	Mon, 23 Jan 2017 20:06:05 +0000 (21:06 +0100)
committer	Nathan Cutler <ncutler@suse.com>
	Mon, 3 Jul 2017 14:37:32 +0000 (16:37 +0200)
commit	071f111abbd7d6c7a90fc58f52c84907cf4d9860
tree	0d31e7c99f29920e6c429316200122c85e1b6bd7	tree \| snapshot
parent	f31033cb5bc7764b44871c15717aed5a34921881	commit \| diff

osd: Return correct osd_objectstore in OSD metadata

Do not simply read the configuration value as it might have changed
during OSD startup by reading the type from disk.

Fixes: http://tracker.ceph.com/issues/18638
Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit 8fe6a0303b02ac1033f5bfced9f94350fe3e33de)

Conflicts:
    src/osd/OSD.cc
      - g_conf->osd_objectstore was changed to cct->_conf->osd_objectstore by
        1d5e967a05ddbcceb10efe3b57e242b3b6b7eb8c which is not in kraken