From: Haomai Wang Date: Fri, 21 Nov 2014 09:27:10 +0000 (+0800) Subject: Merge pull request #2981 from yuyuyu101/quick-fix X-Git-Tag: v0.90~53 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e0ab267c757ca82e52d4139d6b09dd6bfe627f97;p=ceph.git Merge pull request #2981 from yuyuyu101/quick-fix GenericObjectMap: Avoid master branch compile error --- e0ab267c757ca82e52d4139d6b09dd6bfe627f97