]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1815 from ceph/osd-metadata
authorLoic Dachary <loic@dachary.org>
Thu, 22 May 2014 08:58:07 +0000 (10:58 +0200)
committerLoic Dachary <loic@dachary.org>
Thu, 22 May 2014 08:58:07 +0000 (10:58 +0200)
osd: include osd_objectstore in metadata reported to mon

Reviewed-by: Loic Dachary <loic@dachary.org>
1  2 
src/osd/OSD.cc

diff --cc src/osd/OSD.cc
Simple merge