From: Sage Weil Date: Fri, 25 May 2018 13:18:42 +0000 (-0500) Subject: Merge PR #22163 into wip-sage-testing-20180525.131829 X-Git-Tag: v14.0.0~16 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=250c462669983a1a02905e6b712ae9283f96c7cb;p=ceph.git Merge PR #22163 into wip-sage-testing-20180525.131829 * refs/pull/22163/head: CodingStyle: update my_type_t sample CodingStyle: allow #pragma once CodingStyle: a few updates Reviewed-by: Kefu Chai Reviewed-by: Josh Durgin Reviewed-by: Jesse Williamson --- 250c462669983a1a02905e6b712ae9283f96c7cb