From: David Zafman Date: Fri, 5 Aug 2016 00:01:12 +0000 (-0700) Subject: Merge pull request #10565 from dzafman/wip-16672 X-Git-Tag: ses5-milestone5~220 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6fed82a086f903042e431a8b06162e8ea7ea4874;p=ceph.git Merge pull request #10565 from dzafman/wip-16672 OSD crash with Hammer to Jewel Upgrade: void FileStore::init_temp_collections() Reviewed-by: Samuel Just --- 6fed82a086f903042e431a8b06162e8ea7ea4874