You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ta...@apache.org on 2020/02/29 15:02:19 UTC
[skywalking] branch rest_api updated (3178f7e -> e05e4e9)
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 3178f7e Merge branch 'master' into rest_api
add 649f430 add e2e.
add f5031fa e2e
add cab97c6 revert application.yml
add e05e4e9 init e2e
No new revisions were added by this update.
Summary of changes:
.gitignore | 1 +
.../src/main/resources/application.yml | 58 ++++++------
.../v6/rest/ServiceRegisterServletHandler.java | 3 +
.../pom.xml | 101 +++++++++++++++------
.../src/docker/conf.d/nginx.conf | 82 +++++++++++++++++
.../src/docker/rc.d/rc0-prepare.sh | 12 ++-
.../src/docker/rc.d/rc1-startup.sh | 4 -
.../e2e/sample/client/SampleClientApplication.java | 0
.../e2e/sample/client/TestController.java | 0
.../apache/skywalking/e2e/sample/client/User.java | 0
.../skywalking/e2e/sample/client/UserRepo.java | 0
.../src/main/resources/application.yml | 0
.../skywalking/e2e/SampleVerificationITCase.java | 59 +++++++-----
...king.e2e.SampleVerificationITCase.endpoints.yml | 0
...king.e2e.SampleVerificationITCase.instances.yml | 0
...ampleVerificationITCase.serviceInstanceTopo.yml | 0
...lking.e2e.SampleVerificationITCase.services.yml | 0
...kywalking.e2e.SampleVerificationITCase.topo.yml | 0
...walking.e2e.SampleVerificationITCase.traces.yml | 0
test/e2e/pom.xml | 1 +
20 files changed, 234 insertions(+), 87 deletions(-)
copy test/e2e/{e2e-influxdb => e2e-http-api-with-nginx-lua}/pom.xml (70%)
create mode 100644 test/e2e/e2e-http-api-with-nginx-lua/src/docker/conf.d/nginx.conf
copy test/e2e/{e2e-influxdb => e2e-http-api-with-nginx-lua}/src/docker/rc.d/rc0-prepare.sh (68%)
copy test/e2e/{e2e-agent-reboot => e2e-http-api-with-nginx-lua}/src/docker/rc.d/rc1-startup.sh (93%)
copy test/e2e/{e2e-single-service => e2e-http-api-with-nginx-lua}/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java (100%)
copy test/e2e/{e2e-single-service => e2e-http-api-with-nginx-lua}/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java (100%)
copy test/e2e/{e2e-single-service => e2e-http-api-with-nginx-lua}/src/main/java/org/apache/skywalking/e2e/sample/client/User.java (100%)
copy test/e2e/{e2e-single-service => e2e-http-api-with-nginx-lua}/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java (100%)
copy test/e2e/{e2e-single-service => e2e-http-api-with-nginx-lua}/src/main/resources/application.yml (100%)
copy test/e2e/{e2e-6.x-agent-7.x-oap-compatibility => e2e-http-api-with-nginx-lua}/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java (87%)
copy test/e2e/{e2e-single-service => e2e-http-api-with-nginx-lua}/src/test/resources/expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.endpoints.yml (100%)
copy test/e2e/{e2e-single-service => e2e-http-api-with-nginx-lua}/src/test/resources/expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.instances.yml (100%)
copy test/e2e/{e2e-single-service => e2e-http-api-with-nginx-lua}/src/test/resources/expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.serviceInstanceTopo.yml (100%)
copy test/e2e/{e2e-single-service => e2e-http-api-with-nginx-lua}/src/test/resources/expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.services.yml (100%)
copy test/e2e/{e2e-single-service => e2e-http-api-with-nginx-lua}/src/test/resources/expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.topo.yml (100%)
copy test/e2e/{e2e-single-service => e2e-http-api-with-nginx-lua}/src/test/resources/expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.traces.yml (100%)