You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2018/11/14 15:24:46 UTC
[incubator-skywalking] branch master updated: Fix the license being
pointed out by Justin in release vote. (#1910)
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 4e3fa95 Fix the license being pointed out by Justin in release vote. (#1910)
4e3fa95 is described below
commit 4e3fa955626f49d32a7609d9bbd1d8ab93e3be92
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Nov 14 23:24:40 2018 +0800
Fix the license being pointed out by Justin in release vote. (#1910)
---
LICENSE | 2 +-
apm-dist/release-docs/LICENSE | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/LICENSE b/LICENSE
index 3387170..7ab1aa1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -226,7 +226,7 @@ BSD licenses
The following components are provided under a BSD license. See project link for details.
The text of each license is also included at licenses/LICENSE-[project].txt.
- proto files from gogo protobuf: https://github.com/gogo/protobuf BSD-3
+ proto files from gogo protobuf: https://github.com/gogo/protobuf BSD-2
========================================================================
diff --git a/apm-dist/release-docs/LICENSE b/apm-dist/release-docs/LICENSE
index 9dc3f53..a1b60a3 100644
--- a/apm-dist/release-docs/LICENSE
+++ b/apm-dist/release-docs/LICENSE
@@ -331,7 +331,8 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
Google: protobuf-java 3.4.0: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause
Google: protobuf-java-util 3.4.0: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause
reflectasm 1.11.3: https://github.com/EsotericSoftware/reflectasm , BSD-3-Clause
- gogo-protobuf, proto files: https://github.com/gogo/protobuf BSD-3-Clause
+
+ gogo-protobuf, proto files: https://github.com/gogo/protobuf BSD-2-Clause
========================================================================
MPL 2.0 licenses