From: Nathan Cutler Date: Wed, 23 Nov 2016 20:42:24 +0000 (+0100) Subject: Merge pull request #11933 from SUSE/wip-17142-hammer X-Git-Tag: v0.94.10~49 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e4ea9452cf78e01413714b597f49d32d1d11a6dd;p=ceph.git Merge pull request #11933 from SUSE/wip-17142-hammer hammer: osd: PG::_update_calc_stats wrong for CRUSH_ITEM_NONE up set items Reviewed-by: Samuel Just --- e4ea9452cf78e01413714b597f49d32d1d11a6dd