]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #8917 from liewegas/wip-civetweb-fix
authorSage Weil <sage@redhat.com>
Tue, 3 May 2016 20:01:41 +0000 (16:01 -0400)
committerSage Weil <sage@redhat.com>
Tue, 3 May 2016 20:01:41 +0000 (16:01 -0400)
civetweb: combine various submodule changes

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

Trivial merge