You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by mi...@apache.org on 2019/01/02 05:55:49 UTC

[incubator-dubbo-ops] 01/01: Merge branch 'develop' into service-test

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

min pushed a commit to branch service-test
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git

commit 5c17102d3ab91bcc92e94e41c7404da37d7f0bbb
Merge: 3ad0eea 5881150
Author: nzomkxia <z8...@gmail.com>
AuthorDate: Wed Jan 2 13:55:47 2019 +0800

    Merge branch 'develop' into service-test
    
    # Conflicts:
    #	dubbo-admin-backend/pom.xml
    #	dubbo-admin-frontend/src/components/test/ServiceTest.vue

 README.md                                          |  2 +-
 dubbo-admin-backend/pom.xml                        |  5 ---
 .../apache/dubbo/admin/config/ConfigCenter.java    |  8 ++---
 .../admin/handler/CustomExceptionHandler.java      |  4 ++-
 .../dubbo/admin/service/impl/RouteServiceImpl.java |  4 +--
 .../src/components/governance/WeightAdjust.vue     |  1 +
 .../src/components/metrics/ServiceMetrics.vue      | 40 ++++++++++++++++++++++
 .../src/components/public/Toolbar.vue              |  6 ++--
 .../src/components/test/ServiceMock.vue            | 40 ++++++++++++++++++++++
 dubbo-admin-frontend/src/router/index.js           | 22 ++++++++++--
 pom.xml                                            |  6 ----
 11 files changed, 112 insertions(+), 26 deletions(-)