From 0becca2e96e3cf2fac1dc383e8890d617e306fe3 Mon Sep 17 00:00:00 2001 From: Eugene Yakubovich Date: Tue, 29 Sep 2015 11:51:33 -0700 Subject: [PATCH] Change copyright from CoreOS to CNI authors CNI is developed by more than just CoreOS, Inc and the copyright is retained by all CNI contributors (for their respective contributed code). --- libcni/api.go | 2 +- libcni/conf.go | 2 +- pkg/invoke/args.go | 2 +- pkg/invoke/exec.go | 2 +- pkg/invoke/find.go | 2 +- pkg/ip/cidr.go | 2 +- pkg/ip/ipforward.go | 2 +- pkg/ip/ipmasq.go | 2 +- pkg/ip/link.go | 2 +- pkg/ip/route.go | 2 +- pkg/ipam/ipam.go | 2 +- pkg/ns/ns.go | 2 +- pkg/skel/skel.go | 2 +- pkg/types/args.go | 2 +- pkg/types/types.go | 2 +- plugins/ipam/dhcp/daemon.go | 2 +- plugins/ipam/dhcp/lease.go | 2 +- plugins/ipam/dhcp/main.go | 2 +- plugins/ipam/dhcp/options.go | 2 +- plugins/ipam/dhcp/options_test.go | 2 +- plugins/ipam/host-local/allocator.go | 2 +- plugins/ipam/host-local/backend/disk/backend.go | 2 +- plugins/ipam/host-local/backend/disk/lock.go | 2 +- plugins/ipam/host-local/backend/store.go | 2 +- plugins/ipam/host-local/config.go | 2 +- plugins/ipam/host-local/main.go | 2 +- plugins/main/bridge/bridge.go | 2 +- plugins/main/ipvlan/ipvlan.go | 2 +- plugins/main/macvlan/macvlan.go | 2 +- plugins/main/ptp/ptp.go | 2 +- plugins/meta/flannel/flannel.go | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/libcni/api.go b/libcni/api.go index 4ad714a0..b308ef84 100644 --- a/libcni/api.go +++ b/libcni/api.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/libcni/conf.go b/libcni/conf.go index 47babeb4..029769e4 100644 --- a/libcni/conf.go +++ b/libcni/conf.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/invoke/args.go b/pkg/invoke/args.go index 6f0a813a..be28ba62 100644 --- a/pkg/invoke/args.go +++ b/pkg/invoke/args.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/invoke/exec.go b/pkg/invoke/exec.go index cf0cff47..90564970 100644 --- a/pkg/invoke/exec.go +++ b/pkg/invoke/exec.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/invoke/find.go b/pkg/invoke/find.go index dfad12bc..82f9a9b7 100644 --- a/pkg/invoke/find.go +++ b/pkg/invoke/find.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/ip/cidr.go b/pkg/ip/cidr.go index 723a1f74..dae2c4d0 100644 --- a/pkg/ip/cidr.go +++ b/pkg/ip/cidr.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/ip/ipforward.go b/pkg/ip/ipforward.go index 0a1ca252..77ee7463 100644 --- a/pkg/ip/ipforward.go +++ b/pkg/ip/ipforward.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/ip/ipmasq.go b/pkg/ip/ipmasq.go index 7f8740df..44b7edf3 100644 --- a/pkg/ip/ipmasq.go +++ b/pkg/ip/ipmasq.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/ip/link.go b/pkg/ip/link.go index 44e5d84d..1ba529da 100644 --- a/pkg/ip/link.go +++ b/pkg/ip/link.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/ip/route.go b/pkg/ip/route.go index 04e660ef..6c8658b2 100644 --- a/pkg/ip/route.go +++ b/pkg/ip/route.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/ipam/ipam.go b/pkg/ipam/ipam.go index 6a593a26..4920838a 100644 --- a/pkg/ipam/ipam.go +++ b/pkg/ipam/ipam.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/ns/ns.go b/pkg/ns/ns.go index 20548b9b..9996aac7 100644 --- a/pkg/ns/ns.go +++ b/pkg/ns/ns.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/skel/skel.go b/pkg/skel/skel.go index d6204dd4..5c3532db 100644 --- a/pkg/skel/skel.go +++ b/pkg/skel/skel.go @@ -1,4 +1,4 @@ -// Copyright 2014 CoreOS, Inc. +// Copyright 2014 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/types/args.go b/pkg/types/args.go index 68162435..3c0fd88e 100644 --- a/pkg/types/args.go +++ b/pkg/types/args.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/types/types.go b/pkg/types/types.go index 21ba32d6..7fce5b82 100644 --- a/pkg/types/types.go +++ b/pkg/types/types.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/plugins/ipam/dhcp/daemon.go b/plugins/ipam/dhcp/daemon.go index 1fc91f20..dabedf72 100644 --- a/plugins/ipam/dhcp/daemon.go +++ b/plugins/ipam/dhcp/daemon.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/plugins/ipam/dhcp/lease.go b/plugins/ipam/dhcp/lease.go index 42a2d86a..c8bfb8d9 100644 --- a/plugins/ipam/dhcp/lease.go +++ b/plugins/ipam/dhcp/lease.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/plugins/ipam/dhcp/main.go b/plugins/ipam/dhcp/main.go index c35bdf4a..da44d576 100644 --- a/plugins/ipam/dhcp/main.go +++ b/plugins/ipam/dhcp/main.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/plugins/ipam/dhcp/options.go b/plugins/ipam/dhcp/options.go index 9189e5be..f2712c28 100644 --- a/plugins/ipam/dhcp/options.go +++ b/plugins/ipam/dhcp/options.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/plugins/ipam/dhcp/options_test.go b/plugins/ipam/dhcp/options_test.go index 5aa129d7..0a140cef 100644 --- a/plugins/ipam/dhcp/options_test.go +++ b/plugins/ipam/dhcp/options_test.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/plugins/ipam/host-local/allocator.go b/plugins/ipam/host-local/allocator.go index 9756a117..c333952c 100644 --- a/plugins/ipam/host-local/allocator.go +++ b/plugins/ipam/host-local/allocator.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/plugins/ipam/host-local/backend/disk/backend.go b/plugins/ipam/host-local/backend/disk/backend.go index 15a67feb..88dc5e92 100644 --- a/plugins/ipam/host-local/backend/disk/backend.go +++ b/plugins/ipam/host-local/backend/disk/backend.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/plugins/ipam/host-local/backend/disk/lock.go b/plugins/ipam/host-local/backend/disk/lock.go index febb11cd..72414825 100644 --- a/plugins/ipam/host-local/backend/disk/lock.go +++ b/plugins/ipam/host-local/backend/disk/lock.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/plugins/ipam/host-local/backend/store.go b/plugins/ipam/host-local/backend/store.go index b06bd180..45a89b10 100644 --- a/plugins/ipam/host-local/backend/store.go +++ b/plugins/ipam/host-local/backend/store.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/plugins/ipam/host-local/config.go b/plugins/ipam/host-local/config.go index 8d219557..72d26360 100644 --- a/plugins/ipam/host-local/config.go +++ b/plugins/ipam/host-local/config.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/plugins/ipam/host-local/main.go b/plugins/ipam/host-local/main.go index 06c95c9c..f1d7d6ae 100644 --- a/plugins/ipam/host-local/main.go +++ b/plugins/ipam/host-local/main.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/plugins/main/bridge/bridge.go b/plugins/main/bridge/bridge.go index 24549770..82c3511a 100644 --- a/plugins/main/bridge/bridge.go +++ b/plugins/main/bridge/bridge.go @@ -1,4 +1,4 @@ -// Copyright 2014 CoreOS, Inc. +// Copyright 2014 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/plugins/main/ipvlan/ipvlan.go b/plugins/main/ipvlan/ipvlan.go index 31a21d52..0c16cc04 100644 --- a/plugins/main/ipvlan/ipvlan.go +++ b/plugins/main/ipvlan/ipvlan.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/plugins/main/macvlan/macvlan.go b/plugins/main/macvlan/macvlan.go index c92de10b..77fb65f6 100644 --- a/plugins/main/macvlan/macvlan.go +++ b/plugins/main/macvlan/macvlan.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/plugins/main/ptp/ptp.go b/plugins/main/ptp/ptp.go index 58d52ef9..ae2dc986 100644 --- a/plugins/main/ptp/ptp.go +++ b/plugins/main/ptp/ptp.go @@ -1,4 +1,4 @@ -// Copyright 2015 CoreOS, Inc. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/plugins/meta/flannel/flannel.go b/plugins/meta/flannel/flannel.go index 2dd811d7..60de6afd 100644 --- a/plugins/meta/flannel/flannel.go +++ b/plugins/meta/flannel/flannel.go @@ -1,4 +1,4 @@ -// Copyright 2015 CNI Authors. +// Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License.