From: Sage Weil <sage@redhat.com>
Date: Tue, 3 May 2016 19:01:19 +0000 (-0400)
Subject: civetweb: combine various submodule changes
X-Git-Tag: v11.0.0~733^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b99681de6a04435d538d85a262bf40b5234ef8f5;p=ceph.git

civetweb: combine various submodule changes

There were some accidental reverts, fixes, re-reverts,
and follow-on changes that are hard to follow and in the
end did not include what we want.  Merge it all together.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/civetweb b/src/civetweb
index 8d271315a541..e12494070432 160000
--- a/src/civetweb
+++ b/src/civetweb
@@ -1 +1 @@
-Subproject commit 8d271315a541218caada366f84a2690fdbd474a2
+Subproject commit e12494070432b85d5ffce7dece81c0baad457a5f