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

Posted to commits@skywalking.apache.org by ha...@apache.org on 2018/06/28 02:18:59 UTC

[incubator-skywalking] 01/02: Merge branch 'master' into submodule/ui

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

hanahmily pushed a commit to branch submodule/ui
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git

commit 6e68b640b419e002a26c191e7bff5570e7cc6fe5
Merge: 922c621 1e0d932
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Jun 28 10:17:43 2018 +0800

    Merge branch 'master' into submodule/ui

 CHANGES.md                                         | 79 +++++++++++++++++++---
 .../es/dao/ui/ApplicationComponentEsUIDAO.java     |  2 +-
 .../es/dao/ui/ApplicationMappingEsUIDAO.java       |  2 +-
 .../es/dao/ui/ApplicationMetricEsUIDAO.java        |  6 +-
 .../dao/ui/ApplicationReferenceMetricEsUIDAO.java  |  6 +-
 .../storage/es/dao/ui/InstanceEsUIDAO.java         | 18 ++---
 apm-dist/release-docs/LICENSE                      |  2 +
 .../licenses/ui-licenses/LICENSE-rc-dropdown       |  9 +++
 apm-webapp/src/main/resources/application.yml      |  2 +-
 docs/README_ZH.md                                  |  2 +
 10 files changed, 102 insertions(+), 26 deletions(-)