From b736078e3c5bbeb8a21ca0bde8950a98f49496ee Mon Sep 17 00:00:00 2001 From: Ray Zhou Date: Sat, 18 Apr 2020 14:17:56 +0800 Subject: [PATCH 1/3] Update Makefile license description --- Makefile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index cc8a305a6..2a9337b19 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,16 @@ # Copyright 2018 The KubeSphere Authors. All rights reserved. -# Use of this source code is governed by a Apache license -# that can be found in the LICENSE file. +# +# Licensed 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. # The binary to build BIN ?= ks-apiserver @@ -15,7 +25,6 @@ else GOBIN=$(shell go env GOBIN) endif - IMG ?= kubespheredev/ks-apiserver OUTPUT_DIR=bin GOFLAGS=-mod=vendor From 1e21c0ff4236e89b3f1fa8d7266b52ceacac9ee6 Mon Sep 17 00:00:00 2001 From: Ray Zhou Date: Sat, 18 Apr 2020 14:22:38 +0800 Subject: [PATCH 2/3] Revert "Update Makefile license description" This reverts commit b736078e3c5bbeb8a21ca0bde8950a98f49496ee. --- Makefile | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 2a9337b19..cc8a305a6 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,6 @@ # Copyright 2018 The KubeSphere Authors. All rights reserved. -# -# Licensed 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. +# Use of this source code is governed by a Apache license +# that can be found in the LICENSE file. # The binary to build BIN ?= ks-apiserver @@ -25,6 +15,7 @@ else GOBIN=$(shell go env GOBIN) endif + IMG ?= kubespheredev/ks-apiserver OUTPUT_DIR=bin GOFLAGS=-mod=vendor From 34d53400058b4e6749ccae1ca816a1e6f276589c Mon Sep 17 00:00:00 2001 From: Ray Zhou Date: Sat, 18 Apr 2020 14:25:38 +0800 Subject: [PATCH 3/3] Update makefile header license description --- Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cc8a305a6..2e2216784 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,14 @@ # Copyright 2018 The KubeSphere Authors. All rights reserved. -# Use of this source code is governed by a Apache license -# that can be found in the LICENSE file. +# +# Licensed under the Apache License, Version 2.0 (the "License"). +# You may not use this file except in compliance with the License +# described in the file LICENSE. +# +# 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. # The binary to build BIN ?= ks-apiserver