You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/07/13 01:06:00 UTC
[incubator-skywalking] branch master updated: Add words in two
License files. (#1450)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 86bb1c0 Add words in two License files. (#1450)
86bb1c0 is described below
commit 86bb1c05e420b8e11ab137775fc0a0f0790cb28e
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu Jul 12 18:05:56 2018 -0700
Add words in two License files. (#1450)
---
LICENSE | 10 ++++++++++
apm-dist/release-docs/LICENSE | 1 +
2 files changed, 11 insertions(+)
diff --git a/LICENSE b/LICENSE
index 8dada3e..8ae4ae5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,3 +199,13 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
+ =======================================================================
+ Apache SkyWalking Subcomponents:
+
+ The Apache SkyWalking project contains subcomponents with separate copyright
+ notices and license terms. Your use of the source code for the these
+ subcomponents is subject to the terms and conditions of the following
+ licenses.
+
+ iconfont(from antd): https://github.com/ant-design/antd-init/tree/master/examples/local-iconfont MIT
diff --git a/apm-dist/release-docs/LICENSE b/apm-dist/release-docs/LICENSE
index 33a6137..623bc1c 100644
--- a/apm-dist/release-docs/LICENSE
+++ b/apm-dist/release-docs/LICENSE
@@ -378,6 +378,7 @@ MIT licenses
antv/data-set 0.8.6: https://github.com/antvis/data-set MIT
add-dom-event-listener 1.0.2: https://github.com/yiminghe/add-dom-event-listener MIT
antd 3.2.2: https://github.com/ant-design/ant-design MIT
+iconfont(from antd): https://github.com/ant-design/antd-init/tree/master/examples/local-iconfont MIT
ant-design-pro 1.3.0: https://github.com/ant-design/ant-design-pro MIT , declare license in package.json only.
async-validator 1.8.2: https://github.com/yiminghe/async-validator MIT
babel/polyfill 7.0.0-beta.42: https://github.com/babel/babel/tree/master/packages/babel-polyfill MIT , declare license in package.json only.