From 4e3fa955626f49d32a7609d9bbd1d8ab93e3be92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Wed, 14 Nov 2018 23:24:40 +0800 Subject: [PATCH] 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 33871709a1..7ab1aa1b89 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 9dc3f5344a..a1b60a30be 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 -- GitLab