You are viewing a plain text version of this content. The canonical link for it is here.

Posted to notifications@skywalking.apache.org by ke...@apache.org on 2020/07/02 13:44:14 UTC

[skywalking-python] 11/12: Merge branch 'master' into master

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch flask-plugin
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git

commit 10622acf532932e9de9318970ad2e2787600eaad
Merge: 0266262 26879f8
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Wed Jul 1 21:55:33 2020 +0800

    Merge branch 'master' into master

 README.md                                          | 19 ++++++++++
 .../docker-compose.base.yml}                       | 41 +++------------------
 tests/plugin/sw_http/docker-compose.yml            | 42 ++++++----------------
 tests/plugin/sw_http/services/consumer.py          |  1 -
 tests/plugin/sw_http/services/provider.py          |  1 -
 tests/plugin/sw_http/test_http.py                  |  2 +-
 tests/plugin/sw_http_wsgi/docker-compose.yml       | 42 ++++++----------------
 tests/plugin/sw_http_wsgi/services/consumer.py     |  1 -
 tests/plugin/sw_http_wsgi/services/provider.py     |  1 -
 tests/plugin/sw_http_wsgi/test_http_wsgi.py        |  2 +-
 tests/plugin/sw_requests/docker-compose.yml        | 42 ++++++----------------
 tests/plugin/sw_requests/services/consumer.py      |  1 -
 tests/plugin/sw_requests/services/provider.py      |  1 -
 tests/plugin/sw_requests/test_request.py           |  2 +-
 14 files changed, 59 insertions(+), 139 deletions(-)