From: Sage Weil <sage@redhat.com>
Date: Wed, 24 Feb 2016 18:38:06 +0000 (-0800)
Subject: Merge pull request #7680 from ceph/wip-da-SCA-20160203
X-Git-Tag: v10.1.0~312
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4229cd436d889d2e2fa26671a554def9db13dee3;p=ceph.git

Merge pull request #7680 from ceph/wip-da-SCA-20160203

common: various fixes from SCA runs

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <jdillama@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

4229cd436d889d2e2fa26671a554def9db13dee3