You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by ma...@apache.org on 2021/02/18 19:34:37 UTC

[incubator-mxnet] branch master updated: fix license for blockingconcurrentqueue (#19909)

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

manuseth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new ecadeac  fix license for blockingconcurrentqueue (#19909)
ecadeac is described below

commit ecadeac9a2fbacc7e5b726783ecac6bdc7558b1e
Author: Manu Seth <22...@users.noreply.github.com>
AuthorDate: Thu Feb 18 11:32:51 2021 -0800

    fix license for blockingconcurrentqueue (#19909)
---
 LICENSE | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index 1ba4b66..f5c68dd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -277,7 +277,6 @@
     2-clause BSD license
     =======================================================================================
 
-    3rdparty/dmlc-core/include/dmlc/blockingconcurrentqueue.h
     3rdparty/dmlc-core/include/dmlc/concurrentqueue.h
     3rdparty/onnx-tensorrt/third_party/onnx/third_party/pybind11/tools/FindEigen3.cmake  (Copy of the License available at licenses/BSD2)
     3rdparty/onnx-tensorrt/third_party/onnx/third_party/pybind11/tools/FindPythonLibsNew.cmake
@@ -303,7 +302,7 @@
     src/operator/contrib/nn/modulated_deformable_im2col.cuh
 
     =======================================================================================
-    Apache-2.0 license + zlib license
+    2-clause BSD license + zlib license
     =======================================================================================
 
     3rdparty/dmlc-core/include/dmlc/blockingconcurrentqueue.h