This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a change to branch rest_api
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 214671a Merge branch 'rest_api' of github.com:apache/skywalking into
rest_api
add 9b4a9b8 fix
add 630786d fix json array.
add 455857d update e2e.
No new revisions were added by this update.
Summary of changes:
docs/en/protocols/HTTP-API-Protocol.md | 16 ++++++-----
docs/en/protocols/Trace-Data-Protocol-v2.md | 2 +-
.../oap/server/library/util/ProtoBufJsonUtils.java | 1 -
.../ServiceInstanceRegisterServletHandler.java | 7 +++--
.../v6/rest/TraceSegmentCollectServletHandler.java | 6 ++--
test/e2e/e2e-http-api-with-nginx-lua/pom.xml | 33 ++++++++--------------
.../src/docker/conf.d/nginx.conf | 2 --
.../src/docker/rc.d/rc0-prepare.sh | 3 +-
8 files changed, 31 insertions(+), 39 deletions(-)