]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #8961 from xiexingguo/xxg-wip-fixepochtrunc
authorYuri Weinstein <yuri.weinstein@gmail.com>
Mon, 16 May 2016 20:34:49 +0000 (13:34 -0700)
committerYuri Weinstein <yuri.weinstein@gmail.com>
Mon, 16 May 2016 20:34:49 +0000 (13:34 -0700)
osd: don't get inc osdmap name truncated

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/osd/OSD.cc
src/osd/OSD.h

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