You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by zh...@apache.org on 2018/03/21 14:16:24 UTC

[incubator-skywalking] branch feature/tls updated (250c56b -> 6ba29a2)

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

zhangxin pushed a change to branch feature/tls
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.


    from 250c56b  Make sure end user can't start gRPC server with and without SSL in the same port.
     add 11ea4be  fix #939 (#969)
     new 6ba29a2  Merge branch 'master' into feature/tls

The 1 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.


Summary of changes:
 .../apm/collector/storage/es/dao/ui/InstanceMetricEsUIDAO.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
zhangxin@apache.org.

[incubator-skywalking] 01/01: Merge branch 'master' into feature/tls

Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zhangxin pushed a commit to branch feature/tls
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git

commit 6ba29a25e8a1870460fcadb4ac79b0101992ad06
Merge: 250c56b 11ea4be
Author: Xin,Zhang <zh...@apache.org>
AuthorDate: Wed Mar 21 22:16:21 2018 +0800

    Merge branch 'master' into feature/tls

 .../apm/collector/storage/es/dao/ui/InstanceMetricEsUIDAO.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
zhangxin@apache.org.