Merge branch 'master' into http2 515/head
authorGe Jun <jge666@gmail.com>
Wed, 10 Oct 2018 04:09:21 +0000 (12:09 +0800)
committerGitHub <noreply@github.com>
Wed, 10 Oct 2018 04:09:21 +0000 (12:09 +0800)
commit45a1aaaa207fe7c00f90ecd20173dcd5424417bd
treea438c8b9135f9392cd5b14c47b4a9dad7c52552d
parentf87e6a6695576ca552f14238f90d4556151337e5
parentfd45ffc1f1af7730a2c1754c21ada88509dd9145
Merge branch 'master' into http2
src/brpc/policy/http2_rpc_protocol.cpp
src/brpc/policy/http2_rpc_protocol.h