kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 6.0

This commit is contained in:
Wu Sheng 2018-07-10 21:27:41 -07:00
parent 6d6310bfcb dc1dfca010
commit 3136e717a9
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NOTICE
View File

@ -3,3 +3,8 @@ Copyright 2017-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
This product bundles icons/fonts from the ant-design project,
https://github.com/ant-design/antd-init/tree/master/examples/local-iconfont
Licensed under the MIT license, confirmed by ant-design team member.
https://github.com/ant-design/ant-design/issues/10243

7
apm-dist/release-docs/NOTICE
View File

@ -829,3 +829,10 @@ grants independently of ICOT any specific warranty to the user in
writing, such person, organization or entity, will also be exempted
from and not be held liable to the user for any such damages as noted
above as far as the program is concerned.
------
This product bundles icons/fonts from the ant-design project,
https://github.com/ant-design/antd-init/tree/master/examples/local-iconfont
Licensed under the MIT license, confirmed by ant-design team member.
https://github.com/ant-design/ant-design/issues/10243

2
pom.xml
View File

@ -172,6 +172,8 @@
<!-- UI style check files -->
<exclude>**/skywalking-ui/.eslintrc</exclude>
<exclude>**/skywalking-ui/.stylelintrc</exclude>
<!-- UI icon files -->
<exclude>**/skywalking-ui/public/font/iconfont/**</exclude>
<!-- git files -->
<exclude>**/.gitignore</exclude>

2
skywalking-ui

@ -1 +1 @@
Subproject commit 3ecf33899e28ac106e1d421c089c4c4a4d79c23d
Subproject commit f9c602936ab4f386576bf16f203efac61962e424