This is an automated email from the ASF dual-hosted git repository.
wenming pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new d84e3c7 license: fixed license issue for ewma.lua. (#2136)
d84e3c7 is described below
commit d84e3c762aba95347017bf72664e2fdc61a0fe67
Author: Wen Ming <moonbingb...@gmail.com>
AuthorDate: Mon Aug 31 20:54:08 2020 +0800
license: fixed license issue for ewma.lua. (#2136)
---
.travis/ASF-Release.cfg | 3 +++
LICENSE | 11 +++++++++--
apisix/balancer/ewma.lua | 22 +++++-----------------
3 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/.travis/ASF-Release.cfg b/.travis/ASF-Release.cfg
index 5021dab..37283b4 100644
--- a/.travis/ASF-Release.cfg
+++ b/.travis/ASF-Release.cfg
@@ -94,6 +94,9 @@ conf
# Exclude dashboard files
dashboard
+# Exclude subcomponents files
+apisix/balancer/ewma.lua
+
[Options]
# Not all code files allow licenses to appear starting at the first character
# of the file. This option tells the scan to allow licenses to appear starting
diff --git a/LICENSE b/LICENSE
index 2351cfd..1e50066 100644
--- a/LICENSE
+++ b/LICENSE
@@ -201,12 +201,19 @@
limitations under the License.
=======================================================================
-Apache ApiSix Subcomponents:
+Apache APISIX Subcomponents:
-The Apache ApiSix project contains subcomponents with separate copyright
+The Apache APISIX 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.
+========================================================================
+Apache 2.0 licenses
+========================================================================
+
+The following components are provided under the Apache License. See project
link for details.
+The text of each license is the standard Apache 2.0 license.
+
ewma.lua file from kubernetes/ingress-nginx:
https://github.com/kubernetes/ingress-nginx Apache 2.0
diff --git a/apisix/balancer/ewma.lua b/apisix/balancer/ewma.lua
index ba429d9..5198c28 100644
--- a/apisix/balancer/ewma.lua
+++ b/apisix/balancer/ewma.lua
@@ -1,20 +1,8 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one or more
--- contributor license agreements. See the NOTICE file distributed with
--- this work for additional information regarding copyright ownership.
--- The ASF licenses this file to You under the Apache License, Version 2.0
--- (the "License"); you may not use this file except in compliance with
--- the License. You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- 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.
---
-
+-- Original Authors: Shiv Nagarajan & Scott Francis
+-- Accessed: March 12, 2018
+-- Inspiration drawn from:
+--
https://github.com/twitter/finagle/blob/1bc837c4feafc0096e43c0e98516a8e1c50c4421
+--
/finagle-core/src/main/scala/com/twitter/finagle/loadbalancer/PeakEwma.scala
local core = require("apisix.core")
local ngx = ngx
