Merge pull request #102 from oracle/fix-legal-headers

prydie · web-flow · commit 0037545bbcbf · 2017-11-23T10:59:36.000Z
Fix legal headers across project
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -18,7 +18,7 @@ This can be automatically added to pull requests by committing with:
 
 ```
 git commit --signoff
-````
+```
 
 Only pull requests from committers that can be verified as having
 signed the OCA can be accepted.
diff --git a/cmd/oci-cloud-controller-manager/main.go b/cmd/oci-cloud-controller-manager/main.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The Oracle Kubernetes Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/ccm.go b/pkg/oci/ccm.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/client/client.go b/pkg/oci/client/client.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/client/client_test.go b/pkg/oci/client/client_test.go
@@ -1,3 +1,17 @@
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
+
 package client
 
 import (
diff --git a/pkg/oci/client/config.go b/pkg/oci/client/config.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/client/config_test.go b/pkg/oci/client/config_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/client/config_validate.go b/pkg/oci/client/config_validate.go
@@ -1,3 +1,17 @@
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
+
 package client
 
 import (
diff --git a/pkg/oci/client/config_validate_test.go b/pkg/oci/client/config_validate_test.go
@@ -1,3 +1,17 @@
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
+
 package client
 
 import (
diff --git a/pkg/oci/client/error.go b/pkg/oci/client/error.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/client/error_test.go b/pkg/oci/client/error_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/client/fake.go b/pkg/oci/client/fake.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/client/util.go b/pkg/oci/client/util.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/instancemeta/instance_metadata.go b/pkg/oci/instancemeta/instance_metadata.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/instancemeta/instance_metadata_mock.go b/pkg/oci/instancemeta/instance_metadata_mock.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Flexvolume Driver Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/instancemeta/instance_metadata_test.go b/pkg/oci/instancemeta/instance_metadata_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/instances.go b/pkg/oci/instances.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/load_balancer.go b/pkg/oci/load_balancer.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/load_balancer_security_lists.go b/pkg/oci/load_balancer_security_lists.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/load_balancer_security_lists_test.go b/pkg/oci/load_balancer_security_lists_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/load_balancer_spec.go b/pkg/oci/load_balancer_spec.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/load_balancer_spec_test.go b/pkg/oci/load_balancer_spec_test.go
@@ -1,3 +1,17 @@
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
+
 package oci
 
 import (
diff --git a/pkg/oci/load_balancer_util.go b/pkg/oci/load_balancer_util.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/load_balancer_util_test.go b/pkg/oci/load_balancer_util_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/util/util.go b/pkg/oci/util/util.go
@@ -1,3 +1,17 @@
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
+
 package util
 
 import (
diff --git a/pkg/oci/util/util_test.go b/pkg/oci/util/util_test.go
@@ -1,3 +1,17 @@
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
+
 package util
 
 import "testing"
diff --git a/pkg/oci/zones.go b/pkg/oci/zones.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/pkg/oci/zones_test.go b/pkg/oci/zones_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/test/integration/framework/framework.go b/test/integration/framework/framework.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/test/integration/loadbalancer/loadbalancer_test.go b/test/integration/loadbalancer/loadbalancer_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.
diff --git a/test/integration/loadbalancer/main_test.go b/test/integration/loadbalancer/main_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 The OCI Cloud Controller Manager Authors
+// Copyright (c) 2017, Oracle and/or its affiliates. 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.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2017 The Oracle Kubernetes Cloud Controller Manager Authors`
	`1`	`+// Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.`
`2`	`2`	`//`
`3`	`3`	`// Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`// you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2017 The OCI Cloud Controller Manager Authors`
	`1`	`+// Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.`
`2`	`2`	`//`
`3`	`3`	`// Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`// you may not use this file except in compliance with the License.`