From: Sage Weil <sage@redhat.com>
Date: Tue, 3 May 2016 20:01:41 +0000 (-0400)
Subject: Merge pull request #8917 from liewegas/wip-civetweb-fix
X-Git-Tag: v11.0.0~733
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=56edf3a4280920c87e97aa3b54339701fbeba9fe;p=ceph.git

Merge pull request #8917 from liewegas/wip-civetweb-fix

civetweb: combine various submodule changes

Reviewed-by: Adam Emerson <aemerson@redhat.com>
---

56edf3a4280920c87e97aa3b54339701fbeba9fe