Merge pull request kubernetes#1007 from eirinikos/update-license

edit Flannel license info so that GitHub recognizes it
b3atlesfan · Jul 9, 2018 · dcef5ec · dcef5ec
2 parents 62a1314 + ff825f7
commit dcef5ec
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: test e2e-test cover gofmt gofmt-fix license-check clean tar.gz docker-push release docker-push-all flannel-git
+.PHONY: test e2e-test cover gofmt gofmt-fix header-check clean tar.gz docker-push release docker-push-all flannel-git
 
 # Registry used for publishing images
 REGISTRY?=quay.io/coreos/flannel
@@ -67,7 +67,7 @@ ifeq ($(ARCH),amd64)
 endif
 
 ### TESTING
-test: license-check gofmt
+test: header-check gofmt
 	# Run the unit tests
 	# NET_ADMIN capacity is required to do some network operation
 	# SYS_ADMIN capacity is required to create network namespace
@@ -89,8 +89,8 @@ cover:
 	go test -coverprofile cover.out $(PACKAGES_EXPANDED)
 	go tool cover -html=cover.out
 
-license-check:
-	./license-check.sh
+header-check:
+	./header-check.sh
 
 # Throw an error if gofmt finds problems.
 # "read" will return a failure return code if there is no output. This is inverted wth the "!"

diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ See [CONTRIBUTING][contributing] for details on submitting patches and the contr
 
 See [reporting bugs][reporting] for details about reporting any issues.
 
-## License
+## Licensing
 
 Flannel is under the Apache 2.0 license. See the [LICENSE][license] file for details.
 

diff --git a/license-check.sh → header-check.sh b/license-check.sh → header-check.sh