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/29 03:32:17 UTC

[incubator-skywalking] branch submodule/ui created (now efdfcfd)

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

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


      at efdfcfd  Update submodule skywalking-ui

This branch includes the following new commits:

     new 3985f52  Merge branch 'master' into submodule/ui
     new efdfcfd  Update submodule skywalking-ui

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



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

Posted by ha...@apache.org.
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 3985f52db71f4a532208f5fddfca7ffbc085169a
Merge: 8b4e2cd 621ed2c
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Jun 29 11:31:24 2018 +0800

    Merge branch 'master' into submodule/ui

 .../collector/storage/ui/service/ServiceMetric.java   | 19 +++++++------------
 .../storage/es/dao/ui/ServiceMetricEsUIDAO.java       |  3 ++-
 .../dao/ui/ServiceMetricShardingjdbcUIDAO.java        |  3 ++-
 .../apm/collector/ui/service/ApplicationService.java  |  6 ++++--
 .../apm/collector/ui/service/ServiceNameService.java  |  6 ++++--
 .../collector/ui/service/ApplicationServiceTest.java  |  7 ++++---
 .../collector/ui/service/ServiceNameServiceTest.java  | 18 +++++++++++++++---
 .../main/resources/ui-graphql/service-layer.graphqls  |  3 +--
 8 files changed, 39 insertions(+), 26 deletions(-)


[incubator-skywalking] 02/02: Update submodule skywalking-ui

Posted by ha...@apache.org.
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 efdfcfdc11b12edba24d4d85bee4d81be3ddf93f
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Jun 29 11:31:57 2018 +0800

    Update submodule skywalking-ui
---
 skywalking-ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skywalking-ui b/skywalking-ui
index bfc7d68..be7cd13 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit bfc7d6881573650e126076ffa29b726dde22d680
+Subproject commit be7cd13e89ac66a50ef48c1944f232967a1a0d26