From 74bcc18e179e4e2fa867cc8dcfe716a0ade812d1 Mon Sep 17 00:00:00 2001 From: Hua Kuang Date: Wed, 20 Jan 2021 17:58:57 +0000 Subject: [PATCH 1/3] DAOS-6338 DAOS:Change DAOS license text #3 Covers src/control and subdirs Skip-build: true Skip-test: true Change-Id: I57927127e843315c451459472c62d77f0f5ea44a Signed-off-by: Hua Kuang --- src/control/build/variables.go | 22 +-------- src/control/cmd/daos_admin/handler.go | 21 +-------- src/control/cmd/daos_admin/handler_test.go | 21 +-------- src/control/cmd/daos_admin/main.go | 21 +-------- src/control/cmd/daos_agent/attachinfo.go | 21 +-------- src/control/cmd/daos_agent/config.go | 21 +-------- src/control/cmd/daos_agent/infocache.go | 21 +-------- src/control/cmd/daos_agent/infocache_test.go | 21 +-------- src/control/cmd/daos_agent/main.go | 19 +------- src/control/cmd/daos_agent/mgmt_rpc.go | 21 +-------- src/control/cmd/daos_agent/network.go | 21 +-------- src/control/cmd/daos_agent/procmon.go | 20 +------- src/control/cmd/daos_agent/security_rpc.go | 21 +-------- .../cmd/daos_agent/security_rpc_test.go | 21 +-------- src/control/cmd/daos_agent/start.go | 21 +-------- src/control/cmd/daos_firmware/handler.go | 21 +-------- src/control/cmd/daos_firmware/handler_test.go | 21 +-------- src/control/cmd/daos_firmware/main.go | 21 +-------- src/control/cmd/daos_server/config.go | 21 +-------- src/control/cmd/daos_server/main.go | 19 +------- src/control/cmd/daos_server/network.go | 21 +-------- src/control/cmd/daos_server/start.go | 21 +-------- src/control/cmd/daos_server/start_test.go | 21 +-------- src/control/cmd/daos_server/storage.go | 21 +-------- src/control/cmd/daos_server/storage_test.go | 21 +-------- src/control/cmd/dmg/acl.go | 21 +-------- src/control/cmd/dmg/acl_test.go | 21 +-------- src/control/cmd/dmg/auto.go | 21 +-------- src/control/cmd/dmg/auto_test.go | 21 +-------- src/control/cmd/dmg/command_test.go | 19 +------- src/control/cmd/dmg/cont.go | 21 +-------- src/control/cmd/dmg/cont_test.go | 21 +-------- src/control/cmd/dmg/firmware.go | 22 +-------- src/control/cmd/dmg/firmware_disabled.go | 22 +-------- src/control/cmd/dmg/firmware_test.go | 22 +-------- src/control/cmd/dmg/json_test.go | 20 +------- src/control/cmd/dmg/main.go | 19 +------- src/control/cmd/dmg/man_test.go | 21 +-------- src/control/cmd/dmg/network.go | 21 +-------- src/control/cmd/dmg/network_test.go | 21 +-------- src/control/cmd/dmg/pool.go | 19 +------- src/control/cmd/dmg/pool_test.go | 19 +------- src/control/cmd/dmg/pretty/firmware.go | 22 +-------- src/control/cmd/dmg/pretty/firmware_test.go | 22 +-------- src/control/cmd/dmg/pretty/network.go | 21 +-------- src/control/cmd/dmg/pretty/pool.go | 19 +------- src/control/cmd/dmg/pretty/pool_test.go | 19 +------- src/control/cmd/dmg/pretty/printers.go | 21 +-------- src/control/cmd/dmg/pretty/printers_test.go | 21 +-------- src/control/cmd/dmg/pretty/ranks.go | 19 +------- src/control/cmd/dmg/pretty/storage.go | 21 +-------- src/control/cmd/dmg/pretty/storage_nvme.go | 21 +-------- .../cmd/dmg/pretty/storage_nvme_test.go | 21 +-------- src/control/cmd/dmg/pretty/storage_scm.go | 21 +-------- .../cmd/dmg/pretty/storage_scm_test.go | 21 +-------- src/control/cmd/dmg/pretty/storage_test.go | 21 +-------- src/control/cmd/dmg/storage.go | 21 +-------- src/control/cmd/dmg/storage_query.go | 21 +-------- src/control/cmd/dmg/storage_query_test.go | 21 +-------- src/control/cmd/dmg/storage_test.go | 19 +------- src/control/cmd/dmg/system.go | 19 +------- src/control/cmd/dmg/system_test.go | 21 +-------- src/control/cmd/dmg/utils.go | 19 +------- src/control/cmd/dmg/utils_test.go | 19 +------- .../cmd/drpc_test/hello/drpc_test_module.go | 21 +-------- src/control/cmd/drpc_test/main.go | 21 +-------- src/control/common/collection_utils.go | 21 +-------- src/control/common/collection_utils_test.go | 21 +-------- src/control/common/env_utils.go | 21 +-------- src/control/common/env_utils_test.go | 21 +-------- src/control/common/file_utils.go | 21 +-------- src/control/common/file_utils_test.go | 21 +-------- src/control/common/mocks.go | 21 +-------- src/control/common/net_utils.go | 21 +-------- src/control/common/net_utils_test.go | 21 +-------- src/control/common/pci_utils.go | 21 +-------- src/control/common/pci_utils_test.go | 21 +-------- src/control/common/proto/convert/types.go | 21 +-------- src/control/common/proto/error.go | 21 +-------- src/control/common/proto/error_test.go | 21 +-------- src/control/common/proto/mgmt/addons.go | 21 +-------- src/control/common/proto/mocks.go | 19 +------- src/control/common/proto/types.go | 19 +------- src/control/common/proto/types_test.go | 21 +-------- src/control/common/storage/commands.go | 21 +-------- src/control/common/test_utils.go | 21 +-------- src/control/common/time_utils.go | 21 +-------- src/control/common/types.go | 19 +------- src/control/common/types_test.go | 21 +-------- src/control/common/user_utils.go | 21 +-------- src/control/drpc/drpc_client.go | 21 +-------- src/control/drpc/drpc_client_test.go | 21 +-------- src/control/drpc/drpc_server.go | 20 +------- src/control/drpc/drpc_server_test.go | 20 +------- src/control/drpc/failure.go | 20 +------- src/control/drpc/failure_test.go | 20 +------- src/control/drpc/mocks_test.go | 20 +------- src/control/drpc/module_svc.go | 20 +------- src/control/drpc/module_svc_test.go | 20 +------- src/control/drpc/modules.go | 21 +-------- src/control/drpc/modules_test.go | 21 +-------- src/control/drpc/property.go | 21 +-------- src/control/drpc/status.go | 21 +-------- src/control/drpc/status_test.go | 21 +-------- src/control/events/psr_update.go | 19 +------- src/control/events/psr_update_test.go | 19 +------- src/control/events/pubsub.go | 21 +-------- src/control/events/pubsub_test.go | 21 +-------- src/control/events/rank_down.go | 19 +------- src/control/events/rank_down_test.go | 19 +------- src/control/events/ras.go | 19 +------- src/control/fault/code/codes.go | 19 +------- src/control/fault/fault.go | 21 +-------- src/control/fault/fault_test.go | 21 +-------- src/control/lib/atm/bool.go | 21 +-------- src/control/lib/atm/bool_test.go | 21 +-------- src/control/lib/control/acl.go | 21 +-------- src/control/lib/control/acl_test.go | 21 +-------- src/control/lib/control/auto.go | 21 +-------- src/control/lib/control/auto_test.go | 21 +-------- src/control/lib/control/config.go | 21 +-------- src/control/lib/control/config_test.go | 21 +-------- src/control/lib/control/cont.go | 21 +-------- src/control/lib/control/cont_test.go | 21 +-------- src/control/lib/control/control.go | 21 +-------- src/control/lib/control/doc.go | 21 +-------- src/control/lib/control/faults.go | 21 +-------- src/control/lib/control/firmware.go | 20 +------- src/control/lib/control/firmware_test.go | 22 +-------- src/control/lib/control/hostlist.go | 21 +-------- src/control/lib/control/hostlist_test.go | 21 +-------- src/control/lib/control/interceptors.go | 21 +-------- src/control/lib/control/mocks.go | 21 +-------- src/control/lib/control/network.go | 19 +------- src/control/lib/control/network_test.go | 21 +-------- src/control/lib/control/pool.go | 19 +------- src/control/lib/control/pool_acl.go | 21 +-------- src/control/lib/control/pool_acl_test.go | 21 +-------- src/control/lib/control/pool_test.go | 19 +------- src/control/lib/control/request.go | 21 +-------- src/control/lib/control/response.go | 21 +-------- src/control/lib/control/response_test.go | 21 +-------- src/control/lib/control/rpc.go | 19 +------- src/control/lib/control/rpc_test.go | 19 +------- src/control/lib/control/server_meta.go | 19 +------- src/control/lib/control/server_meta_test.go | 19 +------- src/control/lib/control/storage.go | 19 +------- src/control/lib/control/storage_test.go | 21 +-------- src/control/lib/control/system.go | 19 +------- src/control/lib/control/system_test.go | 19 +------- src/control/lib/hostlist/api.go | 21 +-------- src/control/lib/hostlist/api_test.go | 21 +-------- src/control/lib/hostlist/fuzz.go | 22 +-------- src/control/lib/hostlist/hostgroup.go | 21 +-------- src/control/lib/hostlist/hostlist.go | 21 +-------- src/control/lib/hostlist/hostlist_test.go | 21 +-------- src/control/lib/hostlist/hostrange.go | 21 +-------- src/control/lib/hostlist/hostset.go | 21 +-------- src/control/lib/hostlist/hostset_test.go | 21 +-------- src/control/lib/hostlist/numericlist.go | 21 +-------- src/control/lib/hostlist/numericlist_test.go | 21 +-------- src/control/lib/ipmctl/nvm.go | 21 +-------- src/control/lib/ipmctl/nvm_test.go | 21 +-------- src/control/lib/ipmctl/nvm_types.go | 21 +-------- src/control/lib/netdetect/netdetect.go | 23 +--------- .../netdetect/netdetect_integration_test.go | 22 +-------- src/control/lib/netdetect/netdetect_test.go | 21 +-------- src/control/lib/spdk/ctests/nvme_control_ut.c | 46 +------------------ src/control/lib/spdk/faults.go | 21 +-------- src/control/lib/spdk/include/nvme_control.h | 31 +------------ .../lib/spdk/include/nvme_control_common.h | 32 +------------ src/control/lib/spdk/mocks.go | 21 +-------- src/control/lib/spdk/nvme.go | 21 +-------- src/control/lib/spdk/nvme_test.go | 21 +-------- src/control/lib/spdk/spdk.go | 21 +-------- src/control/lib/spdk/spdk_test.go | 21 +-------- src/control/lib/txtfmt/entity.go | 19 +------- src/control/lib/txtfmt/entity_test.go | 19 +------- src/control/lib/txtfmt/table.go | 21 +-------- src/control/lib/txtfmt/table_test.go | 21 +-------- src/control/lib/txtfmt/writer.go | 20 +------- src/control/lib/txtfmt/writer_test.go | 21 +-------- src/control/logging/debug.go | 21 +-------- src/control/logging/defaults.go | 21 +-------- src/control/logging/error.go | 21 +-------- src/control/logging/formatting.go | 21 +-------- src/control/logging/info.go | 21 +-------- src/control/logging/json.go | 21 +-------- src/control/logging/level.go | 21 +-------- src/control/logging/level_test.go | 21 +-------- src/control/logging/logger.go | 21 +-------- src/control/logging/logging_test.go | 21 +-------- src/control/logging/syslog.go | 22 +-------- src/control/logging/syslog_test.go | 22 +-------- src/control/pbin/app.go | 21 +-------- src/control/pbin/app_test.go | 21 +-------- src/control/pbin/decode_test.go | 21 +-------- src/control/pbin/exec.go | 21 +-------- src/control/pbin/exec_test.go | 21 +-------- src/control/pbin/faults.go | 21 +-------- src/control/pbin/forwarding.go | 21 +-------- src/control/pbin/handler.go | 21 +-------- src/control/pbin/handler_test.go | 21 +-------- src/control/pbin/mocks.go | 21 +-------- src/control/pbin/pbin.go | 21 +-------- src/control/pbin/pbin_test.go | 21 +-------- src/control/pbin/process.go | 21 +-------- src/control/pbin/setuid_linux.go | 22 +-------- src/control/pbin/stdio.go | 21 +-------- src/control/pbin/stdio_test.go | 21 +-------- src/control/provider/system/system.go | 21 +-------- src/control/provider/system/system_linux.go | 21 +-------- .../provider/system/system_linux_test.go | 21 +-------- src/control/security/auth/auth_sys.go | 21 +-------- src/control/security/auth/auth_sys_test.go | 21 +-------- src/control/security/auth/mocks.go | 21 +-------- src/control/security/config.go | 21 +-------- src/control/security/config_test.go | 21 +-------- src/control/security/domain_info.go | 21 +-------- src/control/security/grpc_authorization.go | 19 +------- .../security/grpc_authorization_test.go | 19 +------- src/control/security/grpc_cert_configs.go | 21 +-------- .../security/grpc_cert_configs_pre1.15.go | 21 +-------- src/control/security/grpc_certs.go | 21 +-------- src/control/security/pem.go | 21 +-------- src/control/security/pem_test.go | 21 +-------- src/control/security/signature.go | 21 +-------- src/control/security/signature_test.go | 21 +-------- src/control/server/config/faults.go | 21 +-------- src/control/server/config/loglevel.go | 21 +-------- src/control/server/config/server.go | 21 +-------- src/control/server/config/server_test.go | 21 +-------- src/control/server/ctl_firmware.go | 22 +-------- src/control/server/ctl_firmware_disabled.go | 22 +-------- .../server/ctl_firmware_disabled_test.go | 22 +-------- src/control/server/ctl_firmware_test.go | 22 +-------- src/control/server/ctl_network_rpc.go | 21 +-------- src/control/server/ctl_network_rpc_test.go | 21 +-------- src/control/server/ctl_ranks_rpc.go | 19 +------- src/control/server/ctl_ranks_rpc_test.go | 19 +------- src/control/server/ctl_smd_rpc.go | 21 +-------- src/control/server/ctl_smd_rpc_test.go | 19 +------- src/control/server/ctl_storage.go | 21 +-------- src/control/server/ctl_storage_rpc.go | 21 +-------- src/control/server/ctl_storage_rpc_test.go | 19 +------- src/control/server/ctl_storage_test.go | 21 +-------- src/control/server/ctl_svc.go | 19 +------- src/control/server/ctl_svc_test.go | 19 +------- src/control/server/drpc.go | 21 +-------- src/control/server/drpc_test.go | 21 +-------- src/control/server/faultdomain.go | 21 +-------- src/control/server/faultdomain_test.go | 21 +-------- src/control/server/faults.go | 19 +------- src/control/server/harness.go | 21 +-------- src/control/server/harness_test.go | 21 +-------- src/control/server/hugepages.go | 21 +-------- src/control/server/hugepages_test.go | 21 +-------- src/control/server/instance.go | 21 +-------- src/control/server/instance_drpc.go | 19 +------- src/control/server/instance_drpc_test.go | 21 +-------- src/control/server/instance_exec.go | 21 +-------- src/control/server/instance_storage.go | 21 +-------- src/control/server/instance_storage_rpc.go | 21 +-------- src/control/server/instance_storage_test.go | 21 +-------- src/control/server/instance_superblock.go | 21 +-------- .../server/instance_superblock_test.go | 21 +-------- src/control/server/instance_test.go | 21 +-------- src/control/server/interceptors.go | 21 +-------- src/control/server/interceptors_test.go | 21 +-------- src/control/server/ioserver/config.go | 21 +-------- src/control/server/ioserver/config_test.go | 21 +-------- src/control/server/ioserver/exec.go | 21 +-------- src/control/server/ioserver/exec_test.go | 21 +-------- src/control/server/ioserver/mocks.go | 21 +-------- src/control/server/ioserver/tags.go | 21 +-------- src/control/server/ioserver/tags_test.go | 21 +-------- src/control/server/ioserver/util.go | 21 +-------- src/control/server/mgmt_cont.go | 21 +-------- src/control/server/mgmt_cont_test.go | 19 +------- src/control/server/mgmt_drpc.go | 19 +------- src/control/server/mgmt_drpc_test.go | 21 +-------- src/control/server/mgmt_pool.go | 19 +------- src/control/server/mgmt_pool_test.go | 19 +------- src/control/server/mgmt_svc.go | 19 +------- src/control/server/mgmt_svc_test.go | 19 +------- src/control/server/mgmt_system.go | 19 +------- src/control/server/mgmt_system_test.go | 19 +------- src/control/server/security_rpc.go | 21 +-------- src/control/server/security_rpc_test.go | 21 +-------- src/control/server/server.go | 19 +------- src/control/server/storage/bdev/backend.go | 21 +-------- .../server/storage/bdev/backend_test.go | 21 +-------- src/control/server/storage/bdev/class.go | 21 +-------- src/control/server/storage/bdev/class_test.go | 21 +-------- src/control/server/storage/bdev/faults.go | 21 +-------- src/control/server/storage/bdev/firmware.go | 22 +-------- .../server/storage/bdev/firmware_disabled.go | 22 +-------- .../server/storage/bdev/firmware_test.go | 22 +-------- src/control/server/storage/bdev/forwarder.go | 21 +-------- src/control/server/storage/bdev/mocks.go | 21 +-------- src/control/server/storage/bdev/provider.go | 21 +-------- .../server/storage/bdev/provider_test.go | 21 +-------- src/control/server/storage/bdev/runner.go | 21 +-------- .../server/storage/bdev/runner_test.go | 21 +-------- src/control/server/storage/config.go | 19 +------- src/control/server/storage/mocks.go | 21 +-------- src/control/server/storage/scm/faults.go | 21 +-------- src/control/server/storage/scm/firmware.go | 22 +-------- .../server/storage/scm/firmware_disabled.go | 22 +-------- .../server/storage/scm/firmware_test.go | 22 +-------- src/control/server/storage/scm/forwarder.go | 21 +-------- src/control/server/storage/scm/ipmctl.go | 21 +-------- src/control/server/storage/scm/ipmctl_test.go | 21 +-------- src/control/server/storage/scm/mocks.go | 21 +-------- src/control/server/storage/scm/provider.go | 21 +-------- .../server/storage/scm/provider_test.go | 21 +-------- src/control/server/storage/types.go | 21 +-------- src/control/server/test_utils.go | 19 +------- src/control/system/database.go | 19 +------- src/control/system/database_members.go | 21 +-------- src/control/system/database_pools.go | 19 +------- src/control/system/database_test.go | 19 +------- src/control/system/errors.go | 19 +------- src/control/system/faultdomain.go | 19 +------- src/control/system/faultdomain_test.go | 19 +------- src/control/system/hclogger.go | 21 +-------- src/control/system/member.go | 21 +-------- src/control/system/member_test.go | 21 +-------- src/control/system/membership.go | 19 +------- src/control/system/membership_test.go | 21 +-------- src/control/system/mocks.go | 21 +-------- src/control/system/raft.go | 21 +-------- src/control/system/rank.go | 19 +------- src/control/system/rank_test.go | 21 +-------- src/control/system/ranklist.go | 21 +-------- src/control/system/ranklist_test.go | 21 +-------- .../rpc/errdetails/error_details.pb.go | 11 +---- .../googleapis/rpc/status/status.pb.go | 11 +---- 338 files changed, 610 insertions(+), 6401 deletions(-) diff --git a/src/control/build/variables.go b/src/control/build/variables.go index 09ebbcbd12d..d8995201506 100644 --- a/src/control/build/variables.go +++ b/src/control/build/variables.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2020-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // Package build provides an importable repository of variables set at build time. package build diff --git a/src/control/cmd/daos_admin/handler.go b/src/control/cmd/daos_admin/handler.go index c93270584cb..ddb65041dd9 100644 --- a/src/control/cmd/daos_admin/handler.go +++ b/src/control/cmd/daos_admin/handler.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_admin/handler_test.go b/src/control/cmd/daos_admin/handler_test.go index 0fffde70092..050e292e516 100644 --- a/src/control/cmd/daos_admin/handler_test.go +++ b/src/control/cmd/daos_admin/handler_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_admin/main.go b/src/control/cmd/daos_admin/main.go index 6277db9e8c0..b5891ce797e 100644 --- a/src/control/cmd/daos_admin/main.go +++ b/src/control/cmd/daos_admin/main.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_agent/attachinfo.go b/src/control/cmd/daos_agent/attachinfo.go index c812c955b7f..d3344b3e084 100644 --- a/src/control/cmd/daos_agent/attachinfo.go +++ b/src/control/cmd/daos_agent/attachinfo.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_agent/config.go b/src/control/cmd/daos_agent/config.go index 221e11ea3df..1b57f2d46b0 100644 --- a/src/control/cmd/daos_agent/config.go +++ b/src/control/cmd/daos_agent/config.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_agent/infocache.go b/src/control/cmd/daos_agent/infocache.go index 16e77dd17cf..ccb02e371ef 100644 --- a/src/control/cmd/daos_agent/infocache.go +++ b/src/control/cmd/daos_agent/infocache.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_agent/infocache_test.go b/src/control/cmd/daos_agent/infocache_test.go index c2e15b257de..462eba73d03 100644 --- a/src/control/cmd/daos_agent/infocache_test.go +++ b/src/control/cmd/daos_agent/infocache_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_agent/main.go b/src/control/cmd/daos_agent/main.go index 7366dbe6cd6..1d2dc867576 100644 --- a/src/control/cmd/daos_agent/main.go +++ b/src/control/cmd/daos_agent/main.go @@ -1,24 +1,7 @@ // // (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_agent/mgmt_rpc.go b/src/control/cmd/daos_agent/mgmt_rpc.go index 14220df3963..2185eb9aff8 100644 --- a/src/control/cmd/daos_agent/mgmt_rpc.go +++ b/src/control/cmd/daos_agent/mgmt_rpc.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_agent/network.go b/src/control/cmd/daos_agent/network.go index 7cf45762c89..bf7d1d694fd 100644 --- a/src/control/cmd/daos_agent/network.go +++ b/src/control/cmd/daos_agent/network.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_agent/procmon.go b/src/control/cmd/daos_agent/procmon.go index a768a3f02b2..8ce634f7612 100644 --- a/src/control/cmd/daos_agent/procmon.go +++ b/src/control/cmd/daos_agent/procmon.go @@ -1,23 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or +// SPDX-License-Identifier: BSD-2-Clause-Patent // portions thereof marked with this legend must also reproduce the markings. package main diff --git a/src/control/cmd/daos_agent/security_rpc.go b/src/control/cmd/daos_agent/security_rpc.go index 503dacf5c20..2ab4ce3b0d3 100644 --- a/src/control/cmd/daos_agent/security_rpc.go +++ b/src/control/cmd/daos_agent/security_rpc.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_agent/security_rpc_test.go b/src/control/cmd/daos_agent/security_rpc_test.go index 975a02422c9..2167ab011a5 100644 --- a/src/control/cmd/daos_agent/security_rpc_test.go +++ b/src/control/cmd/daos_agent/security_rpc_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_agent/start.go b/src/control/cmd/daos_agent/start.go index 4652f1e4421..b91c143ca86 100644 --- a/src/control/cmd/daos_agent/start.go +++ b/src/control/cmd/daos_agent/start.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_firmware/handler.go b/src/control/cmd/daos_firmware/handler.go index fd0cafaaaea..310bcfc4d70 100644 --- a/src/control/cmd/daos_firmware/handler.go +++ b/src/control/cmd/daos_firmware/handler.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // // +build firmware diff --git a/src/control/cmd/daos_firmware/handler_test.go b/src/control/cmd/daos_firmware/handler_test.go index 324c2dbad8d..2f6c804d5ba 100644 --- a/src/control/cmd/daos_firmware/handler_test.go +++ b/src/control/cmd/daos_firmware/handler_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // // +build firmware diff --git a/src/control/cmd/daos_firmware/main.go b/src/control/cmd/daos_firmware/main.go index 2536e28aab8..798bb86423e 100644 --- a/src/control/cmd/daos_firmware/main.go +++ b/src/control/cmd/daos_firmware/main.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // // +build firmware diff --git a/src/control/cmd/daos_server/config.go b/src/control/cmd/daos_server/config.go index ab7e65a8c72..9d7928ad07f 100644 --- a/src/control/cmd/daos_server/config.go +++ b/src/control/cmd/daos_server/config.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_server/main.go b/src/control/cmd/daos_server/main.go index dc523c48fd6..e5f5c68c454 100644 --- a/src/control/cmd/daos_server/main.go +++ b/src/control/cmd/daos_server/main.go @@ -1,24 +1,7 @@ // // (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_server/network.go b/src/control/cmd/daos_server/network.go index cd39692b6d0..f23d676592a 100644 --- a/src/control/cmd/daos_server/network.go +++ b/src/control/cmd/daos_server/network.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_server/start.go b/src/control/cmd/daos_server/start.go index bc261236065..efea8784553 100644 --- a/src/control/cmd/daos_server/start.go +++ b/src/control/cmd/daos_server/start.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_server/start_test.go b/src/control/cmd/daos_server/start_test.go index cd7f1804dad..e7ea62332b8 100644 --- a/src/control/cmd/daos_server/start_test.go +++ b/src/control/cmd/daos_server/start_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_server/storage.go b/src/control/cmd/daos_server/storage.go index b54958b470c..8edf75068a8 100644 --- a/src/control/cmd/daos_server/storage.go +++ b/src/control/cmd/daos_server/storage.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/daos_server/storage_test.go b/src/control/cmd/daos_server/storage_test.go index 868a235c9fe..ad1db9e7e12 100644 --- a/src/control/cmd/daos_server/storage_test.go +++ b/src/control/cmd/daos_server/storage_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/acl.go b/src/control/cmd/dmg/acl.go index cbcce99c55e..346bbf91996 100644 --- a/src/control/cmd/dmg/acl.go +++ b/src/control/cmd/dmg/acl.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/acl_test.go b/src/control/cmd/dmg/acl_test.go index d74ae16681b..8413f97da01 100644 --- a/src/control/cmd/dmg/acl_test.go +++ b/src/control/cmd/dmg/acl_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/auto.go b/src/control/cmd/dmg/auto.go index f2409f20ccc..697be482599 100644 --- a/src/control/cmd/dmg/auto.go +++ b/src/control/cmd/dmg/auto.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/auto_test.go b/src/control/cmd/dmg/auto_test.go index 19ab4798907..cd617d87164 100644 --- a/src/control/cmd/dmg/auto_test.go +++ b/src/control/cmd/dmg/auto_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/command_test.go b/src/control/cmd/dmg/command_test.go index ed27eb77b90..b848832b033 100644 --- a/src/control/cmd/dmg/command_test.go +++ b/src/control/cmd/dmg/command_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/cont.go b/src/control/cmd/dmg/cont.go index 057db34c9b5..078067d155e 100644 --- a/src/control/cmd/dmg/cont.go +++ b/src/control/cmd/dmg/cont.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/cont_test.go b/src/control/cmd/dmg/cont_test.go index 3a2e6b76c64..dd1fdcbba83 100644 --- a/src/control/cmd/dmg/cont_test.go +++ b/src/control/cmd/dmg/cont_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/firmware.go b/src/control/cmd/dmg/firmware.go index d135f0aa592..e2361eb3f59 100644 --- a/src/control/cmd/dmg/firmware.go +++ b/src/control/cmd/dmg/firmware.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2020-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build firmware package main diff --git a/src/control/cmd/dmg/firmware_disabled.go b/src/control/cmd/dmg/firmware_disabled.go index 90c83eec0d6..4461860528f 100644 --- a/src/control/cmd/dmg/firmware_disabled.go +++ b/src/control/cmd/dmg/firmware_disabled.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2020-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build !firmware package main diff --git a/src/control/cmd/dmg/firmware_test.go b/src/control/cmd/dmg/firmware_test.go index 8f29783d6ad..6a770e5adb0 100644 --- a/src/control/cmd/dmg/firmware_test.go +++ b/src/control/cmd/dmg/firmware_test.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2020-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build firmware package main diff --git a/src/control/cmd/dmg/json_test.go b/src/control/cmd/dmg/json_test.go index a1ae42fbde4..779206b15bc 100644 --- a/src/control/cmd/dmg/json_test.go +++ b/src/control/cmd/dmg/json_test.go @@ -1,23 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or +// SPDX-License-Identifier: BSD-2-Clause-Patent // portions thereof marked with this legend must also reproduce the markings. package main diff --git a/src/control/cmd/dmg/main.go b/src/control/cmd/dmg/main.go index 600aabfdb56..b33df638780 100644 --- a/src/control/cmd/dmg/main.go +++ b/src/control/cmd/dmg/main.go @@ -1,24 +1,7 @@ // // (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/man_test.go b/src/control/cmd/dmg/man_test.go index 918ef643b9d..9c6b1626165 100644 --- a/src/control/cmd/dmg/man_test.go +++ b/src/control/cmd/dmg/man_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/network.go b/src/control/cmd/dmg/network.go index b0ce421a477..dde5386d137 100644 --- a/src/control/cmd/dmg/network.go +++ b/src/control/cmd/dmg/network.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/network_test.go b/src/control/cmd/dmg/network_test.go index 34ce669c1a2..481a3fb7c79 100644 --- a/src/control/cmd/dmg/network_test.go +++ b/src/control/cmd/dmg/network_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/pool.go b/src/control/cmd/dmg/pool.go index 8b06e975bdc..f133a7e5327 100644 --- a/src/control/cmd/dmg/pool.go +++ b/src/control/cmd/dmg/pool.go @@ -1,24 +1,7 @@ // // (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/pool_test.go b/src/control/cmd/dmg/pool_test.go index 92e9fe1eb84..fa1466e659a 100644 --- a/src/control/cmd/dmg/pool_test.go +++ b/src/control/cmd/dmg/pool_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/pretty/firmware.go b/src/control/cmd/dmg/pretty/firmware.go index d3261c02b7f..ae81ba25eb8 100644 --- a/src/control/cmd/dmg/pretty/firmware.go +++ b/src/control/cmd/dmg/pretty/firmware.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2020-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build firmware package pretty diff --git a/src/control/cmd/dmg/pretty/firmware_test.go b/src/control/cmd/dmg/pretty/firmware_test.go index 085529abfe3..5dd980cd8dd 100644 --- a/src/control/cmd/dmg/pretty/firmware_test.go +++ b/src/control/cmd/dmg/pretty/firmware_test.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2020-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build firmware package pretty diff --git a/src/control/cmd/dmg/pretty/network.go b/src/control/cmd/dmg/pretty/network.go index ec92546a6c2..e7b6f460772 100644 --- a/src/control/cmd/dmg/pretty/network.go +++ b/src/control/cmd/dmg/pretty/network.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pretty diff --git a/src/control/cmd/dmg/pretty/pool.go b/src/control/cmd/dmg/pretty/pool.go index df6e8644a84..4d35981d6f5 100644 --- a/src/control/cmd/dmg/pretty/pool.go +++ b/src/control/cmd/dmg/pretty/pool.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pretty diff --git a/src/control/cmd/dmg/pretty/pool_test.go b/src/control/cmd/dmg/pretty/pool_test.go index 54155b37b94..db5148859ea 100644 --- a/src/control/cmd/dmg/pretty/pool_test.go +++ b/src/control/cmd/dmg/pretty/pool_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pretty diff --git a/src/control/cmd/dmg/pretty/printers.go b/src/control/cmd/dmg/pretty/printers.go index b872741292f..be88c9fb38d 100644 --- a/src/control/cmd/dmg/pretty/printers.go +++ b/src/control/cmd/dmg/pretty/printers.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // // Package pretty provides pretty-printers for complex response types. diff --git a/src/control/cmd/dmg/pretty/printers_test.go b/src/control/cmd/dmg/pretty/printers_test.go index 959f7c7029c..22cf9c1f302 100644 --- a/src/control/cmd/dmg/pretty/printers_test.go +++ b/src/control/cmd/dmg/pretty/printers_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pretty diff --git a/src/control/cmd/dmg/pretty/ranks.go b/src/control/cmd/dmg/pretty/ranks.go index a4b46b2041f..333621e7776 100644 --- a/src/control/cmd/dmg/pretty/ranks.go +++ b/src/control/cmd/dmg/pretty/ranks.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pretty diff --git a/src/control/cmd/dmg/pretty/storage.go b/src/control/cmd/dmg/pretty/storage.go index a25c0f29a24..7e02f30be20 100644 --- a/src/control/cmd/dmg/pretty/storage.go +++ b/src/control/cmd/dmg/pretty/storage.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pretty diff --git a/src/control/cmd/dmg/pretty/storage_nvme.go b/src/control/cmd/dmg/pretty/storage_nvme.go index 85518eef65f..c892ed88f97 100644 --- a/src/control/cmd/dmg/pretty/storage_nvme.go +++ b/src/control/cmd/dmg/pretty/storage_nvme.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pretty diff --git a/src/control/cmd/dmg/pretty/storage_nvme_test.go b/src/control/cmd/dmg/pretty/storage_nvme_test.go index 8731127575b..7cf0ffc67fe 100644 --- a/src/control/cmd/dmg/pretty/storage_nvme_test.go +++ b/src/control/cmd/dmg/pretty/storage_nvme_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pretty diff --git a/src/control/cmd/dmg/pretty/storage_scm.go b/src/control/cmd/dmg/pretty/storage_scm.go index 50accbb03b7..62123550d9f 100644 --- a/src/control/cmd/dmg/pretty/storage_scm.go +++ b/src/control/cmd/dmg/pretty/storage_scm.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pretty diff --git a/src/control/cmd/dmg/pretty/storage_scm_test.go b/src/control/cmd/dmg/pretty/storage_scm_test.go index 8cb878b020d..1d6e9c94c0b 100644 --- a/src/control/cmd/dmg/pretty/storage_scm_test.go +++ b/src/control/cmd/dmg/pretty/storage_scm_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pretty diff --git a/src/control/cmd/dmg/pretty/storage_test.go b/src/control/cmd/dmg/pretty/storage_test.go index 023f6834117..79f4fe143ba 100644 --- a/src/control/cmd/dmg/pretty/storage_test.go +++ b/src/control/cmd/dmg/pretty/storage_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pretty diff --git a/src/control/cmd/dmg/storage.go b/src/control/cmd/dmg/storage.go index 871318100aa..d0ca11a4cb7 100644 --- a/src/control/cmd/dmg/storage.go +++ b/src/control/cmd/dmg/storage.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/storage_query.go b/src/control/cmd/dmg/storage_query.go index 1be1269db0c..b4f452eed08 100644 --- a/src/control/cmd/dmg/storage_query.go +++ b/src/control/cmd/dmg/storage_query.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/storage_query_test.go b/src/control/cmd/dmg/storage_query_test.go index 834741aec57..736abe4717f 100644 --- a/src/control/cmd/dmg/storage_query_test.go +++ b/src/control/cmd/dmg/storage_query_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/storage_test.go b/src/control/cmd/dmg/storage_test.go index 54f6560bf78..9bcd2178137 100644 --- a/src/control/cmd/dmg/storage_test.go +++ b/src/control/cmd/dmg/storage_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/system.go b/src/control/cmd/dmg/system.go index 52ace175f61..241b2ebd99a 100644 --- a/src/control/cmd/dmg/system.go +++ b/src/control/cmd/dmg/system.go @@ -1,24 +1,7 @@ // // (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/system_test.go b/src/control/cmd/dmg/system_test.go index 4acd480eb1b..78d963540a6 100644 --- a/src/control/cmd/dmg/system_test.go +++ b/src/control/cmd/dmg/system_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/utils.go b/src/control/cmd/dmg/utils.go index e76030509bd..5dc73b003cd 100644 --- a/src/control/cmd/dmg/utils.go +++ b/src/control/cmd/dmg/utils.go @@ -1,24 +1,7 @@ // // (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/dmg/utils_test.go b/src/control/cmd/dmg/utils_test.go index b09c030b41d..24dd12fa80c 100644 --- a/src/control/cmd/dmg/utils_test.go +++ b/src/control/cmd/dmg/utils_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/cmd/drpc_test/hello/drpc_test_module.go b/src/control/cmd/drpc_test/hello/drpc_test_module.go index 664a32a2417..1d7edc82adb 100644 --- a/src/control/cmd/drpc_test/hello/drpc_test_module.go +++ b/src/control/cmd/drpc_test/hello/drpc_test_module.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package hello diff --git a/src/control/cmd/drpc_test/main.go b/src/control/cmd/drpc_test/main.go index d5dd2a137f9..eed90a809a3 100644 --- a/src/control/cmd/drpc_test/main.go +++ b/src/control/cmd/drpc_test/main.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package main diff --git a/src/control/common/collection_utils.go b/src/control/common/collection_utils.go index 18f048b94cd..31d3e76e09e 100644 --- a/src/control/common/collection_utils.go +++ b/src/control/common/collection_utils.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package common diff --git a/src/control/common/collection_utils_test.go b/src/control/common/collection_utils_test.go index 30465a14cc3..d6a13dce62f 100644 --- a/src/control/common/collection_utils_test.go +++ b/src/control/common/collection_utils_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package common diff --git a/src/control/common/env_utils.go b/src/control/common/env_utils.go index 06d084cba04..39705c0aefd 100644 --- a/src/control/common/env_utils.go +++ b/src/control/common/env_utils.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package common diff --git a/src/control/common/env_utils_test.go b/src/control/common/env_utils_test.go index 5f9ec478f91..ffbbe522a10 100644 --- a/src/control/common/env_utils_test.go +++ b/src/control/common/env_utils_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package common diff --git a/src/control/common/file_utils.go b/src/control/common/file_utils.go index 8dec0f417df..dcf52223176 100644 --- a/src/control/common/file_utils.go +++ b/src/control/common/file_utils.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package common diff --git a/src/control/common/file_utils_test.go b/src/control/common/file_utils_test.go index 12c32453e64..aaf4ffe1229 100644 --- a/src/control/common/file_utils_test.go +++ b/src/control/common/file_utils_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package common diff --git a/src/control/common/mocks.go b/src/control/common/mocks.go index 8a4228e363b..3c1a47b1670 100644 --- a/src/control/common/mocks.go +++ b/src/control/common/mocks.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package common diff --git a/src/control/common/net_utils.go b/src/control/common/net_utils.go index 3035af30bb1..9ad4e7ac92a 100644 --- a/src/control/common/net_utils.go +++ b/src/control/common/net_utils.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package common diff --git a/src/control/common/net_utils_test.go b/src/control/common/net_utils_test.go index ebabd02f39c..5d07786c6e2 100644 --- a/src/control/common/net_utils_test.go +++ b/src/control/common/net_utils_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package common diff --git a/src/control/common/pci_utils.go b/src/control/common/pci_utils.go index 58a0ff0dbf3..e2ff6a60d41 100644 --- a/src/control/common/pci_utils.go +++ b/src/control/common/pci_utils.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package common diff --git a/src/control/common/pci_utils_test.go b/src/control/common/pci_utils_test.go index 92a6610b9d4..2cbd02cb469 100644 --- a/src/control/common/pci_utils_test.go +++ b/src/control/common/pci_utils_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package common diff --git a/src/control/common/proto/convert/types.go b/src/control/common/proto/convert/types.go index 3f54f7cbc58..9a09b74201f 100644 --- a/src/control/common/proto/convert/types.go +++ b/src/control/common/proto/convert/types.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package convert diff --git a/src/control/common/proto/error.go b/src/control/common/proto/error.go index 58752019e17..adbeaff7ded 100644 --- a/src/control/common/proto/error.go +++ b/src/control/common/proto/error.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package proto diff --git a/src/control/common/proto/error_test.go b/src/control/common/proto/error_test.go index 280cfbd03b2..87cc096f97c 100644 --- a/src/control/common/proto/error_test.go +++ b/src/control/common/proto/error_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package proto_test diff --git a/src/control/common/proto/mgmt/addons.go b/src/control/common/proto/mgmt/addons.go index db8f97af24d..0b7d78479ec 100644 --- a/src/control/common/proto/mgmt/addons.go +++ b/src/control/common/proto/mgmt/addons.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package mgmt diff --git a/src/control/common/proto/mocks.go b/src/control/common/proto/mocks.go index 915bf1d0dc9..d405b3db4bd 100644 --- a/src/control/common/proto/mocks.go +++ b/src/control/common/proto/mocks.go @@ -1,24 +1,7 @@ // // (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package proto diff --git a/src/control/common/proto/types.go b/src/control/common/proto/types.go index e80551ecbf4..cc12cb3543f 100644 --- a/src/control/common/proto/types.go +++ b/src/control/common/proto/types.go @@ -1,24 +1,7 @@ // // (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package proto diff --git a/src/control/common/proto/types_test.go b/src/control/common/proto/types_test.go index 59d155d689c..6a6fc8e2ac8 100644 --- a/src/control/common/proto/types_test.go +++ b/src/control/common/proto/types_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package proto diff --git a/src/control/common/storage/commands.go b/src/control/common/storage/commands.go index 7de13664347..82b63d15039 100644 --- a/src/control/common/storage/commands.go +++ b/src/control/common/storage/commands.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package common_storage diff --git a/src/control/common/test_utils.go b/src/control/common/test_utils.go index 68f1575a46b..60c47f2f6a9 100644 --- a/src/control/common/test_utils.go +++ b/src/control/common/test_utils.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package common diff --git a/src/control/common/time_utils.go b/src/control/common/time_utils.go index 7d8539e7293..fc4d2676e50 100644 --- a/src/control/common/time_utils.go +++ b/src/control/common/time_utils.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package common diff --git a/src/control/common/types.go b/src/control/common/types.go index beb10e755cc..d08e1af0d0b 100644 --- a/src/control/common/types.go +++ b/src/control/common/types.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package common diff --git a/src/control/common/types_test.go b/src/control/common/types_test.go index daeecf698cd..62e3b87f182 100644 --- a/src/control/common/types_test.go +++ b/src/control/common/types_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package common_test diff --git a/src/control/common/user_utils.go b/src/control/common/user_utils.go index c22a9910979..edad8e22bb8 100644 --- a/src/control/common/user_utils.go +++ b/src/control/common/user_utils.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package common diff --git a/src/control/drpc/drpc_client.go b/src/control/drpc/drpc_client.go index b3c0ab885ff..e71b8cfdb15 100644 --- a/src/control/drpc/drpc_client.go +++ b/src/control/drpc/drpc_client.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package drpc diff --git a/src/control/drpc/drpc_client_test.go b/src/control/drpc/drpc_client_test.go index f4968f7b0d2..62ee36063a9 100644 --- a/src/control/drpc/drpc_client_test.go +++ b/src/control/drpc/drpc_client_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package drpc diff --git a/src/control/drpc/drpc_server.go b/src/control/drpc/drpc_server.go index 4a52b134493..7e36a66f589 100644 --- a/src/control/drpc/drpc_server.go +++ b/src/control/drpc/drpc_server.go @@ -1,23 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or +// SPDX-License-Identifier: BSD-2-Clause-Patent // portions thereof marked with this legend must also reproduce the markings. package drpc diff --git a/src/control/drpc/drpc_server_test.go b/src/control/drpc/drpc_server_test.go index 66305b567f7..eb11f5e8c31 100644 --- a/src/control/drpc/drpc_server_test.go +++ b/src/control/drpc/drpc_server_test.go @@ -1,23 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or +// SPDX-License-Identifier: BSD-2-Clause-Patent // portions thereof marked with this legend must also reproduce the markings. package drpc diff --git a/src/control/drpc/failure.go b/src/control/drpc/failure.go index 3cc47db65de..024d54a078e 100644 --- a/src/control/drpc/failure.go +++ b/src/control/drpc/failure.go @@ -1,23 +1,7 @@ // -// (C) Copyright 2018-2019 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or +// SPDX-License-Identifier: BSD-2-Clause-Patent // portions thereof marked with this legend must also reproduce the markings. package drpc diff --git a/src/control/drpc/failure_test.go b/src/control/drpc/failure_test.go index 3fc8815778e..666f2c6d1bb 100644 --- a/src/control/drpc/failure_test.go +++ b/src/control/drpc/failure_test.go @@ -1,23 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or +// SPDX-License-Identifier: BSD-2-Clause-Patent // portions thereof marked with this legend must also reproduce the markings. package drpc diff --git a/src/control/drpc/mocks_test.go b/src/control/drpc/mocks_test.go index 7e03d4a191a..94e479926c9 100644 --- a/src/control/drpc/mocks_test.go +++ b/src/control/drpc/mocks_test.go @@ -1,23 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or +// SPDX-License-Identifier: BSD-2-Clause-Patent // portions thereof marked with this legend must also reproduce the markings. package drpc diff --git a/src/control/drpc/module_svc.go b/src/control/drpc/module_svc.go index 289af97d2f2..6d533816967 100644 --- a/src/control/drpc/module_svc.go +++ b/src/control/drpc/module_svc.go @@ -1,23 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or +// SPDX-License-Identifier: BSD-2-Clause-Patent // portions thereof marked with this legend must also reproduce the markings. package drpc diff --git a/src/control/drpc/module_svc_test.go b/src/control/drpc/module_svc_test.go index 989cd38b23f..9ba177b9194 100644 --- a/src/control/drpc/module_svc_test.go +++ b/src/control/drpc/module_svc_test.go @@ -1,23 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or +// SPDX-License-Identifier: BSD-2-Clause-Patent // portions thereof marked with this legend must also reproduce the markings. package drpc diff --git a/src/control/drpc/modules.go b/src/control/drpc/modules.go index 25565998f50..95ef6475239 100644 --- a/src/control/drpc/modules.go +++ b/src/control/drpc/modules.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // // This file imports all of the DAOS dRPC module/method IDs. diff --git a/src/control/drpc/modules_test.go b/src/control/drpc/modules_test.go index e785c43b63a..71145f5c3e6 100644 --- a/src/control/drpc/modules_test.go +++ b/src/control/drpc/modules_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package drpc diff --git a/src/control/drpc/property.go b/src/control/drpc/property.go index d7eca82e8e9..d6e9f656dff 100644 --- a/src/control/drpc/property.go +++ b/src/control/drpc/property.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package drpc diff --git a/src/control/drpc/status.go b/src/control/drpc/status.go index 06f8efa9c19..816ec6fac59 100644 --- a/src/control/drpc/status.go +++ b/src/control/drpc/status.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // // This file imports all of the DAOS status codes. diff --git a/src/control/drpc/status_test.go b/src/control/drpc/status_test.go index 91a234c8018..ec7de1cbf10 100644 --- a/src/control/drpc/status_test.go +++ b/src/control/drpc/status_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package drpc_test diff --git a/src/control/events/psr_update.go b/src/control/events/psr_update.go index 9b52375f682..732809dfc93 100644 --- a/src/control/events/psr_update.go +++ b/src/control/events/psr_update.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package events diff --git a/src/control/events/psr_update_test.go b/src/control/events/psr_update_test.go index e033b4754d3..3a4836c6e18 100644 --- a/src/control/events/psr_update_test.go +++ b/src/control/events/psr_update_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package events diff --git a/src/control/events/pubsub.go b/src/control/events/pubsub.go index a738b08d6cf..8a74baeff1a 100644 --- a/src/control/events/pubsub.go +++ b/src/control/events/pubsub.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package events diff --git a/src/control/events/pubsub_test.go b/src/control/events/pubsub_test.go index cd86f9ab756..e23c9ae5bec 100644 --- a/src/control/events/pubsub_test.go +++ b/src/control/events/pubsub_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package events diff --git a/src/control/events/rank_down.go b/src/control/events/rank_down.go index 36dac34c2b0..6a827a42fda 100644 --- a/src/control/events/rank_down.go +++ b/src/control/events/rank_down.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package events diff --git a/src/control/events/rank_down_test.go b/src/control/events/rank_down_test.go index 4145300091f..ad98b24f8f7 100644 --- a/src/control/events/rank_down_test.go +++ b/src/control/events/rank_down_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package events diff --git a/src/control/events/ras.go b/src/control/events/ras.go index 12f4b8222ef..407b55bbee9 100644 --- a/src/control/events/ras.go +++ b/src/control/events/ras.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package events diff --git a/src/control/fault/code/codes.go b/src/control/fault/code/codes.go index 4ee2eea8477..1a0487d5a81 100644 --- a/src/control/fault/code/codes.go +++ b/src/control/fault/code/codes.go @@ -1,24 +1,7 @@ // // (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // // Package code is a central repository for all control plane fault codes. diff --git a/src/control/fault/fault.go b/src/control/fault/fault.go index 8fabb997c99..43143f3dcb3 100644 --- a/src/control/fault/fault.go +++ b/src/control/fault/fault.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package fault diff --git a/src/control/fault/fault_test.go b/src/control/fault/fault_test.go index 51c58e93ce7..bb25e63f172 100644 --- a/src/control/fault/fault_test.go +++ b/src/control/fault/fault_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package fault_test diff --git a/src/control/lib/atm/bool.go b/src/control/lib/atm/bool.go index c8fb587d4cd..855a1fbdce4 100644 --- a/src/control/lib/atm/bool.go +++ b/src/control/lib/atm/bool.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // // Package atm provides a collection of thread-safe types. diff --git a/src/control/lib/atm/bool_test.go b/src/control/lib/atm/bool_test.go index 009e9a803b5..ecc4417d419 100644 --- a/src/control/lib/atm/bool_test.go +++ b/src/control/lib/atm/bool_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package atm_test diff --git a/src/control/lib/control/acl.go b/src/control/lib/control/acl.go index 3f3efa0f661..5d8d36c17b8 100644 --- a/src/control/lib/control/acl.go +++ b/src/control/lib/control/acl.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/acl_test.go b/src/control/lib/control/acl_test.go index 6810f987ed9..69d5806ab8d 100644 --- a/src/control/lib/control/acl_test.go +++ b/src/control/lib/control/acl_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/auto.go b/src/control/lib/control/auto.go index eba83dccf81..1636e0d9a4b 100644 --- a/src/control/lib/control/auto.go +++ b/src/control/lib/control/auto.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/auto_test.go b/src/control/lib/control/auto_test.go index c172a62e93e..5a0567fb5ec 100644 --- a/src/control/lib/control/auto_test.go +++ b/src/control/lib/control/auto_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/config.go b/src/control/lib/control/config.go index e1c2be148f5..b0fd2832041 100644 --- a/src/control/lib/control/config.go +++ b/src/control/lib/control/config.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/config_test.go b/src/control/lib/control/config_test.go index 0a04d06b69e..276a389921f 100644 --- a/src/control/lib/control/config_test.go +++ b/src/control/lib/control/config_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/cont.go b/src/control/lib/control/cont.go index c04135ca422..0db9718001e 100644 --- a/src/control/lib/control/cont.go +++ b/src/control/lib/control/cont.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/cont_test.go b/src/control/lib/control/cont_test.go index b9cc33ffacb..fe190580208 100644 --- a/src/control/lib/control/cont_test.go +++ b/src/control/lib/control/cont_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/control.go b/src/control/lib/control/control.go index 3fff4839d65..6ec5bb1ae2e 100644 --- a/src/control/lib/control/control.go +++ b/src/control/lib/control/control.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/doc.go b/src/control/lib/control/doc.go index 043b4189390..88d1c8eb851 100644 --- a/src/control/lib/control/doc.go +++ b/src/control/lib/control/doc.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // /* diff --git a/src/control/lib/control/faults.go b/src/control/lib/control/faults.go index e7935424ddd..e2ef437e219 100644 --- a/src/control/lib/control/faults.go +++ b/src/control/lib/control/faults.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/firmware.go b/src/control/lib/control/firmware.go index 39f0ca93d81..9b0fdfd9058 100644 --- a/src/control/lib/control/firmware.go +++ b/src/control/lib/control/firmware.go @@ -1,25 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. -// +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build firmware package control diff --git a/src/control/lib/control/firmware_test.go b/src/control/lib/control/firmware_test.go index a74293673b6..1ac7b1d5bc0 100644 --- a/src/control/lib/control/firmware_test.go +++ b/src/control/lib/control/firmware_test.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2020-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build firmware package control diff --git a/src/control/lib/control/hostlist.go b/src/control/lib/control/hostlist.go index e5e290533bf..73b5df2fd31 100644 --- a/src/control/lib/control/hostlist.go +++ b/src/control/lib/control/hostlist.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/hostlist_test.go b/src/control/lib/control/hostlist_test.go index cd4b93dbbf6..5baa49d413d 100644 --- a/src/control/lib/control/hostlist_test.go +++ b/src/control/lib/control/hostlist_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/interceptors.go b/src/control/lib/control/interceptors.go index 08f5121d38f..b14344ed78e 100644 --- a/src/control/lib/control/interceptors.go +++ b/src/control/lib/control/interceptors.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/mocks.go b/src/control/lib/control/mocks.go index 6912c372e10..11f20a7bfa9 100644 --- a/src/control/lib/control/mocks.go +++ b/src/control/lib/control/mocks.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/network.go b/src/control/lib/control/network.go index 992a63c9259..a2824262e64 100644 --- a/src/control/lib/control/network.go +++ b/src/control/lib/control/network.go @@ -1,24 +1,7 @@ // // (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/network_test.go b/src/control/lib/control/network_test.go index d2e2fef0c6e..ea921f7c0a1 100644 --- a/src/control/lib/control/network_test.go +++ b/src/control/lib/control/network_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/pool.go b/src/control/lib/control/pool.go index cd6c8a437f0..cd08961811e 100644 --- a/src/control/lib/control/pool.go +++ b/src/control/lib/control/pool.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/pool_acl.go b/src/control/lib/control/pool_acl.go index 0f903b2299b..897bbe40a5c 100644 --- a/src/control/lib/control/pool_acl.go +++ b/src/control/lib/control/pool_acl.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/pool_acl_test.go b/src/control/lib/control/pool_acl_test.go index 6442918b9eb..0373c918e10 100644 --- a/src/control/lib/control/pool_acl_test.go +++ b/src/control/lib/control/pool_acl_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/pool_test.go b/src/control/lib/control/pool_test.go index 287575976c8..dc890f27dd6 100644 --- a/src/control/lib/control/pool_test.go +++ b/src/control/lib/control/pool_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/request.go b/src/control/lib/control/request.go index 75258573f76..2a99844b957 100644 --- a/src/control/lib/control/request.go +++ b/src/control/lib/control/request.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/response.go b/src/control/lib/control/response.go index a9da2dca629..51f2bf3ea22 100644 --- a/src/control/lib/control/response.go +++ b/src/control/lib/control/response.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/response_test.go b/src/control/lib/control/response_test.go index 01217af88c4..de887b9eb02 100644 --- a/src/control/lib/control/response_test.go +++ b/src/control/lib/control/response_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/rpc.go b/src/control/lib/control/rpc.go index 675de5eaa94..24487a6138a 100644 --- a/src/control/lib/control/rpc.go +++ b/src/control/lib/control/rpc.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/rpc_test.go b/src/control/lib/control/rpc_test.go index 7bf435b167b..3ae8cbfd35d 100644 --- a/src/control/lib/control/rpc_test.go +++ b/src/control/lib/control/rpc_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/server_meta.go b/src/control/lib/control/server_meta.go index a110b1d3e19..3995213f756 100644 --- a/src/control/lib/control/server_meta.go +++ b/src/control/lib/control/server_meta.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/server_meta_test.go b/src/control/lib/control/server_meta_test.go index 711108c0c35..e8322edb4bb 100644 --- a/src/control/lib/control/server_meta_test.go +++ b/src/control/lib/control/server_meta_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/storage.go b/src/control/lib/control/storage.go index 10de3346c30..9548bb4c480 100644 --- a/src/control/lib/control/storage.go +++ b/src/control/lib/control/storage.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/storage_test.go b/src/control/lib/control/storage_test.go index 641de20accd..bbb84adc072 100644 --- a/src/control/lib/control/storage_test.go +++ b/src/control/lib/control/storage_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/system.go b/src/control/lib/control/system.go index ed492a1a027..bb99c7cdeab 100644 --- a/src/control/lib/control/system.go +++ b/src/control/lib/control/system.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/control/system_test.go b/src/control/lib/control/system_test.go index 17d9cfea318..da87d8addb2 100644 --- a/src/control/lib/control/system_test.go +++ b/src/control/lib/control/system_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package control diff --git a/src/control/lib/hostlist/api.go b/src/control/lib/hostlist/api.go index fd9a3a211a8..a252335cbcb 100644 --- a/src/control/lib/hostlist/api.go +++ b/src/control/lib/hostlist/api.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package hostlist diff --git a/src/control/lib/hostlist/api_test.go b/src/control/lib/hostlist/api_test.go index b01bf0a1399..38af83e5d52 100644 --- a/src/control/lib/hostlist/api_test.go +++ b/src/control/lib/hostlist/api_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package hostlist_test diff --git a/src/control/lib/hostlist/fuzz.go b/src/control/lib/hostlist/fuzz.go index 548a9d1c269..b756013350f 100644 --- a/src/control/lib/hostlist/fuzz.go +++ b/src/control/lib/hostlist/fuzz.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2019-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build gofuzz package hostlist diff --git a/src/control/lib/hostlist/hostgroup.go b/src/control/lib/hostlist/hostgroup.go index 1f2d971153c..1f9cd019af1 100644 --- a/src/control/lib/hostlist/hostgroup.go +++ b/src/control/lib/hostlist/hostgroup.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package hostlist diff --git a/src/control/lib/hostlist/hostlist.go b/src/control/lib/hostlist/hostlist.go index d0e82ead108..3860cc8ffca 100644 --- a/src/control/lib/hostlist/hostlist.go +++ b/src/control/lib/hostlist/hostlist.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package hostlist diff --git a/src/control/lib/hostlist/hostlist_test.go b/src/control/lib/hostlist/hostlist_test.go index 55aa28ccaa2..18e4364efa4 100644 --- a/src/control/lib/hostlist/hostlist_test.go +++ b/src/control/lib/hostlist/hostlist_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package hostlist_test diff --git a/src/control/lib/hostlist/hostrange.go b/src/control/lib/hostlist/hostrange.go index bde4b034cbf..de553ee988e 100644 --- a/src/control/lib/hostlist/hostrange.go +++ b/src/control/lib/hostlist/hostrange.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package hostlist diff --git a/src/control/lib/hostlist/hostset.go b/src/control/lib/hostlist/hostset.go index ac02c1005bd..2aa211da225 100644 --- a/src/control/lib/hostlist/hostset.go +++ b/src/control/lib/hostlist/hostset.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package hostlist diff --git a/src/control/lib/hostlist/hostset_test.go b/src/control/lib/hostlist/hostset_test.go index a06a8ca81aa..38b3dbf7047 100644 --- a/src/control/lib/hostlist/hostset_test.go +++ b/src/control/lib/hostlist/hostset_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package hostlist_test diff --git a/src/control/lib/hostlist/numericlist.go b/src/control/lib/hostlist/numericlist.go index aeed4377cd5..57115890732 100644 --- a/src/control/lib/hostlist/numericlist.go +++ b/src/control/lib/hostlist/numericlist.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package hostlist diff --git a/src/control/lib/hostlist/numericlist_test.go b/src/control/lib/hostlist/numericlist_test.go index 2d78abe95e0..ecabc4ff3ca 100644 --- a/src/control/lib/hostlist/numericlist_test.go +++ b/src/control/lib/hostlist/numericlist_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package hostlist_test diff --git a/src/control/lib/ipmctl/nvm.go b/src/control/lib/ipmctl/nvm.go index 59b9bcb9faf..0c7bbed116f 100644 --- a/src/control/lib/ipmctl/nvm.go +++ b/src/control/lib/ipmctl/nvm.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // // Package ipmctl provides Go bindings for libipmctl Native Management API diff --git a/src/control/lib/ipmctl/nvm_test.go b/src/control/lib/ipmctl/nvm_test.go index 0f8daa339af..fec4c0d3991 100644 --- a/src/control/lib/ipmctl/nvm_test.go +++ b/src/control/lib/ipmctl/nvm_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package ipmctl diff --git a/src/control/lib/ipmctl/nvm_types.go b/src/control/lib/ipmctl/nvm_types.go index 80f46f389cb..12cdc94b762 100644 --- a/src/control/lib/ipmctl/nvm_types.go +++ b/src/control/lib/ipmctl/nvm_types.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package ipmctl diff --git a/src/control/lib/netdetect/netdetect.go b/src/control/lib/netdetect/netdetect.go index 01ec6b23f4a..36810c9e884 100644 --- a/src/control/lib/netdetect/netdetect.go +++ b/src/control/lib/netdetect/netdetect.go @@ -1,26 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. -// -// +build linux,amd64 +// SPDX-License-Identifier: BSD-2-Clause-Patent // package netdetect diff --git a/src/control/lib/netdetect/netdetect_integration_test.go b/src/control/lib/netdetect/netdetect_integration_test.go index a9aec28de19..b2dd9a850f7 100644 --- a/src/control/lib/netdetect/netdetect_integration_test.go +++ b/src/control/lib/netdetect/netdetect_integration_test.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2020-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build concurrency package netdetect diff --git a/src/control/lib/netdetect/netdetect_test.go b/src/control/lib/netdetect/netdetect_test.go index b3fb3306d6e..d847cb3ac20 100644 --- a/src/control/lib/netdetect/netdetect_test.go +++ b/src/control/lib/netdetect/netdetect_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package netdetect diff --git a/src/control/lib/spdk/ctests/nvme_control_ut.c b/src/control/lib/spdk/ctests/nvme_control_ut.c index 26efa9ed1e6..234cb8cfbe6 100644 --- a/src/control/lib/spdk/ctests/nvme_control_ut.c +++ b/src/control/lib/spdk/ctests/nvme_control_ut.c @@ -1,49 +1,7 @@ /** -* (C) Copyright 2019-2020 Intel Corporation. +* (C) Copyright 2019-2021 Intel Corporation. * -* 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. -* -* GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -* The Government's rights to use, modify, reproduce, release, perform, display, -* or disclose this software are subject to the terms of the Apache License as -* provided in Contract No. 8F-30005. -* Any reproduction of computer software, computer software documentation, or -* portions thereof marked with this legend must also reproduce the markings. -*/ - -#include -#include -#include -#include - -#include -#include -#include -#include -#include "nvme_internal.h" - -#include "../include/nvme_control_common.h" - -#if D_HAS_WARNING(4, "-Wframe-larger-than=") - #pragma GCC diagnostic ignored "-Wframe-larger-than=" -#endif - -static struct ret_t *test_ret; - -/** - * ============================== - * nvme_control mock functions - * ============================== +* SPDX-License-Identifier: BSD-2-Clause-Patent */ static int diff --git a/src/control/lib/spdk/faults.go b/src/control/lib/spdk/faults.go index def31ea9ea6..77d84f87db7 100644 --- a/src/control/lib/spdk/faults.go +++ b/src/control/lib/spdk/faults.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package spdk diff --git a/src/control/lib/spdk/include/nvme_control.h b/src/control/lib/spdk/include/nvme_control.h index 2f9455d3c92..33cb7b5588e 100644 --- a/src/control/lib/spdk/include/nvme_control.h +++ b/src/control/lib/spdk/include/nvme_control.h @@ -1,34 +1,7 @@ /** -* (C) Copyright 2018-2020 Intel Corporation. +* (C) Copyright 2018-2021 Intel Corporation. * -* 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. -* -* GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -* The Government's rights to use, modify, reproduce, release, perform, display, -* or disclose this software are subject to the terms of the Apache License as -* provided in Contract No. 8F-30005. -* Any reproduction of computer software, computer software documentation, or -* portions thereof marked with this legend must also reproduce the markings. -*/ - -#ifndef NVMECONTROL_H -#define NVMECONTROL_H - -/** - * Discover NVMe controllers and namespaces, as well as return device health - * information. - * - * \return a pointer to a return struct (ret_t). +* SPDX-License-Identifier: BSD-2-Clause-Patent */ struct ret_t * nvme_discover(void); diff --git a/src/control/lib/spdk/include/nvme_control_common.h b/src/control/lib/spdk/include/nvme_control_common.h index 62b1018d230..a0c83540fae 100644 --- a/src/control/lib/spdk/include/nvme_control_common.h +++ b/src/control/lib/spdk/include/nvme_control_common.h @@ -1,35 +1,7 @@ /** -* (C) Copyright 2019-2020 Intel Corporation. +* (C) Copyright 2019-2021 Intel Corporation. * -* 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. -* -* GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -* The Government's rights to use, modify, reproduce, release, perform, display, -* or disclose this software are subject to the terms of the Apache License as -* provided in Contract No. 8F-30005. -* Any reproduction of computer software, computer software documentation, or -* portions thereof marked with this legend must also reproduce the markings. -*/ - -#ifndef NVMECONTROL_COMMON_H -#define NVMECONTROL_COMMON_H - -#include - -#define BUFLEN 1024 - -/** - * \brief NVMECONTROL return codes +* SPDX-License-Identifier: BSD-2-Clause-Patent */ enum nvme_control_status_code { NVMEC_SUCCESS = 0x0, diff --git a/src/control/lib/spdk/mocks.go b/src/control/lib/spdk/mocks.go index 8f09ee2d5fe..7247d24d94c 100644 --- a/src/control/lib/spdk/mocks.go +++ b/src/control/lib/spdk/mocks.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package spdk diff --git a/src/control/lib/spdk/nvme.go b/src/control/lib/spdk/nvme.go index 7d438dd6082..18eade1a123 100644 --- a/src/control/lib/spdk/nvme.go +++ b/src/control/lib/spdk/nvme.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package spdk diff --git a/src/control/lib/spdk/nvme_test.go b/src/control/lib/spdk/nvme_test.go index d96b59dc27b..23c8805c969 100644 --- a/src/control/lib/spdk/nvme_test.go +++ b/src/control/lib/spdk/nvme_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package spdk diff --git a/src/control/lib/spdk/spdk.go b/src/control/lib/spdk/spdk.go index 75d9de16e5f..02368480df0 100644 --- a/src/control/lib/spdk/spdk.go +++ b/src/control/lib/spdk/spdk.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // // Package spdk provides Go bindings for SPDK diff --git a/src/control/lib/spdk/spdk_test.go b/src/control/lib/spdk/spdk_test.go index 3dadb0ddaa1..9e17edf8ef3 100644 --- a/src/control/lib/spdk/spdk_test.go +++ b/src/control/lib/spdk/spdk_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package spdk diff --git a/src/control/lib/txtfmt/entity.go b/src/control/lib/txtfmt/entity.go index 8a40814855b..815f0c9464f 100644 --- a/src/control/lib/txtfmt/entity.go +++ b/src/control/lib/txtfmt/entity.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package txtfmt diff --git a/src/control/lib/txtfmt/entity_test.go b/src/control/lib/txtfmt/entity_test.go index 0517292c8d1..11b19858684 100644 --- a/src/control/lib/txtfmt/entity_test.go +++ b/src/control/lib/txtfmt/entity_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package txtfmt diff --git a/src/control/lib/txtfmt/table.go b/src/control/lib/txtfmt/table.go index 6fb2141402e..2f80c4a1921 100644 --- a/src/control/lib/txtfmt/table.go +++ b/src/control/lib/txtfmt/table.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package txtfmt diff --git a/src/control/lib/txtfmt/table_test.go b/src/control/lib/txtfmt/table_test.go index af8090f31d3..e592adc3ab7 100644 --- a/src/control/lib/txtfmt/table_test.go +++ b/src/control/lib/txtfmt/table_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package txtfmt diff --git a/src/control/lib/txtfmt/writer.go b/src/control/lib/txtfmt/writer.go index 1d95a822cc9..fd493641222 100644 --- a/src/control/lib/txtfmt/writer.go +++ b/src/control/lib/txtfmt/writer.go @@ -1,23 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or +// SPDX-License-Identifier: BSD-2-Clause-Patent // portions thereof marked with this legend must also reproduce the markings. package txtfmt diff --git a/src/control/lib/txtfmt/writer_test.go b/src/control/lib/txtfmt/writer_test.go index 84520673dc1..945c6e9b417 100644 --- a/src/control/lib/txtfmt/writer_test.go +++ b/src/control/lib/txtfmt/writer_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package txtfmt diff --git a/src/control/logging/debug.go b/src/control/logging/debug.go index fae2cf84a34..cf34c0bf5c6 100644 --- a/src/control/logging/debug.go +++ b/src/control/logging/debug.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package logging diff --git a/src/control/logging/defaults.go b/src/control/logging/defaults.go index 0febeae3e24..628baa7e62d 100644 --- a/src/control/logging/defaults.go +++ b/src/control/logging/defaults.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package logging diff --git a/src/control/logging/error.go b/src/control/logging/error.go index d1197fb2127..92c8008beb4 100644 --- a/src/control/logging/error.go +++ b/src/control/logging/error.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package logging diff --git a/src/control/logging/formatting.go b/src/control/logging/formatting.go index a753771fa3c..4c15124754b 100644 --- a/src/control/logging/formatting.go +++ b/src/control/logging/formatting.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package logging diff --git a/src/control/logging/info.go b/src/control/logging/info.go index 41638500539..e907c636181 100644 --- a/src/control/logging/info.go +++ b/src/control/logging/info.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package logging diff --git a/src/control/logging/json.go b/src/control/logging/json.go index f0d0eaf540e..38037b1bdea 100644 --- a/src/control/logging/json.go +++ b/src/control/logging/json.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package logging diff --git a/src/control/logging/level.go b/src/control/logging/level.go index 4280fa936de..d57f4817c8b 100644 --- a/src/control/logging/level.go +++ b/src/control/logging/level.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package logging diff --git a/src/control/logging/level_test.go b/src/control/logging/level_test.go index 4acc4e4aa66..4461274a5b8 100644 --- a/src/control/logging/level_test.go +++ b/src/control/logging/level_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package logging_test diff --git a/src/control/logging/logger.go b/src/control/logging/logger.go index 566353db27e..e8742114249 100644 --- a/src/control/logging/logger.go +++ b/src/control/logging/logger.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package logging diff --git a/src/control/logging/logging_test.go b/src/control/logging/logging_test.go index d818cc8aa5d..9d2e71dda19 100644 --- a/src/control/logging/logging_test.go +++ b/src/control/logging/logging_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package logging_test diff --git a/src/control/logging/syslog.go b/src/control/logging/syslog.go index 11f47b0bc6e..f3d82bd87d7 100644 --- a/src/control/logging/syslog.go +++ b/src/control/logging/syslog.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2019-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build linux package logging diff --git a/src/control/logging/syslog_test.go b/src/control/logging/syslog_test.go index 7977378f9d0..fd6b0407145 100644 --- a/src/control/logging/syslog_test.go +++ b/src/control/logging/syslog_test.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2019-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build linux package logging_test diff --git a/src/control/pbin/app.go b/src/control/pbin/app.go index cd2a98216d6..5aa32a41d29 100644 --- a/src/control/pbin/app.go +++ b/src/control/pbin/app.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pbin diff --git a/src/control/pbin/app_test.go b/src/control/pbin/app_test.go index 060865231e6..108fe8ad6cb 100644 --- a/src/control/pbin/app_test.go +++ b/src/control/pbin/app_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pbin diff --git a/src/control/pbin/decode_test.go b/src/control/pbin/decode_test.go index 445dca50443..ae9ba7a725e 100644 --- a/src/control/pbin/decode_test.go +++ b/src/control/pbin/decode_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pbin diff --git a/src/control/pbin/exec.go b/src/control/pbin/exec.go index e79cd660a8c..8518abd66e9 100644 --- a/src/control/pbin/exec.go +++ b/src/control/pbin/exec.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pbin diff --git a/src/control/pbin/exec_test.go b/src/control/pbin/exec_test.go index 5a99d442d5f..72ed4e4406a 100644 --- a/src/control/pbin/exec_test.go +++ b/src/control/pbin/exec_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pbin_test diff --git a/src/control/pbin/faults.go b/src/control/pbin/faults.go index c1020288a10..3225c2b9b51 100644 --- a/src/control/pbin/faults.go +++ b/src/control/pbin/faults.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pbin diff --git a/src/control/pbin/forwarding.go b/src/control/pbin/forwarding.go index cb831195dce..d658344ca8b 100644 --- a/src/control/pbin/forwarding.go +++ b/src/control/pbin/forwarding.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pbin diff --git a/src/control/pbin/handler.go b/src/control/pbin/handler.go index 3e6d36e198a..37140df68bd 100644 --- a/src/control/pbin/handler.go +++ b/src/control/pbin/handler.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pbin diff --git a/src/control/pbin/handler_test.go b/src/control/pbin/handler_test.go index cf1ecf7d6b0..75516ec86bb 100644 --- a/src/control/pbin/handler_test.go +++ b/src/control/pbin/handler_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pbin diff --git a/src/control/pbin/mocks.go b/src/control/pbin/mocks.go index 159eaba6ae4..e41edd58049 100644 --- a/src/control/pbin/mocks.go +++ b/src/control/pbin/mocks.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pbin diff --git a/src/control/pbin/pbin.go b/src/control/pbin/pbin.go index 4bd70588331..756497d13d7 100644 --- a/src/control/pbin/pbin.go +++ b/src/control/pbin/pbin.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pbin diff --git a/src/control/pbin/pbin_test.go b/src/control/pbin/pbin_test.go index bb0f8d68d7b..744dcabd5a4 100644 --- a/src/control/pbin/pbin_test.go +++ b/src/control/pbin/pbin_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pbin_test diff --git a/src/control/pbin/process.go b/src/control/pbin/process.go index ba45759a37c..b36a37ed42c 100644 --- a/src/control/pbin/process.go +++ b/src/control/pbin/process.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pbin diff --git a/src/control/pbin/setuid_linux.go b/src/control/pbin/setuid_linux.go index 0708eda0aaf..dc6a065e30a 100644 --- a/src/control/pbin/setuid_linux.go +++ b/src/control/pbin/setuid_linux.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2019-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build linux package pbin diff --git a/src/control/pbin/stdio.go b/src/control/pbin/stdio.go index ff6478c0ff1..0f2afd1b2f3 100644 --- a/src/control/pbin/stdio.go +++ b/src/control/pbin/stdio.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pbin diff --git a/src/control/pbin/stdio_test.go b/src/control/pbin/stdio_test.go index 78d49125282..448329bc6bc 100644 --- a/src/control/pbin/stdio_test.go +++ b/src/control/pbin/stdio_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package pbin_test diff --git a/src/control/provider/system/system.go b/src/control/provider/system/system.go index 44925d258a7..9d0fda6f9af 100644 --- a/src/control/provider/system/system.go +++ b/src/control/provider/system/system.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/provider/system/system_linux.go b/src/control/provider/system/system_linux.go index 43ac5da6d9b..386024637d1 100644 --- a/src/control/provider/system/system_linux.go +++ b/src/control/provider/system/system_linux.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/provider/system/system_linux_test.go b/src/control/provider/system/system_linux_test.go index 40ceed02362..8e89074277d 100644 --- a/src/control/provider/system/system_linux_test.go +++ b/src/control/provider/system/system_linux_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/security/auth/auth_sys.go b/src/control/security/auth/auth_sys.go index 9cf3be054a2..beed4eab3ac 100644 --- a/src/control/security/auth/auth_sys.go +++ b/src/control/security/auth/auth_sys.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package auth diff --git a/src/control/security/auth/auth_sys_test.go b/src/control/security/auth/auth_sys_test.go index f78c3968382..d99a22618dd 100644 --- a/src/control/security/auth/auth_sys_test.go +++ b/src/control/security/auth/auth_sys_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package auth diff --git a/src/control/security/auth/mocks.go b/src/control/security/auth/mocks.go index ddcff768b0d..3cde0f9471b 100644 --- a/src/control/security/auth/mocks.go +++ b/src/control/security/auth/mocks.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package auth diff --git a/src/control/security/config.go b/src/control/security/config.go index 866c3a5cd0a..33849f44933 100644 --- a/src/control/security/config.go +++ b/src/control/security/config.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package security diff --git a/src/control/security/config_test.go b/src/control/security/config_test.go index de7ceb00c97..459eacffc1b 100644 --- a/src/control/security/config_test.go +++ b/src/control/security/config_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package security diff --git a/src/control/security/domain_info.go b/src/control/security/domain_info.go index 3b7be870710..42171ed61b4 100644 --- a/src/control/security/domain_info.go +++ b/src/control/security/domain_info.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package security diff --git a/src/control/security/grpc_authorization.go b/src/control/security/grpc_authorization.go index 4908c8b5ae9..b60ac810667 100644 --- a/src/control/security/grpc_authorization.go +++ b/src/control/security/grpc_authorization.go @@ -1,24 +1,7 @@ // // (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package security diff --git a/src/control/security/grpc_authorization_test.go b/src/control/security/grpc_authorization_test.go index 890f3b3a2b3..e14147ca7bf 100644 --- a/src/control/security/grpc_authorization_test.go +++ b/src/control/security/grpc_authorization_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package security diff --git a/src/control/security/grpc_cert_configs.go b/src/control/security/grpc_cert_configs.go index 767fe84cc52..ff2db853907 100644 --- a/src/control/security/grpc_cert_configs.go +++ b/src/control/security/grpc_cert_configs.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // // +build go1.15 diff --git a/src/control/security/grpc_cert_configs_pre1.15.go b/src/control/security/grpc_cert_configs_pre1.15.go index ed04e54d0f1..8047317fbf1 100644 --- a/src/control/security/grpc_cert_configs_pre1.15.go +++ b/src/control/security/grpc_cert_configs_pre1.15.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // // +build !go1.15 diff --git a/src/control/security/grpc_certs.go b/src/control/security/grpc_certs.go index 4cd9edce105..b5be7b21608 100644 --- a/src/control/security/grpc_certs.go +++ b/src/control/security/grpc_certs.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package security diff --git a/src/control/security/pem.go b/src/control/security/pem.go index 0594f018e3a..f0e9ba1c6b6 100644 --- a/src/control/security/pem.go +++ b/src/control/security/pem.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package security diff --git a/src/control/security/pem_test.go b/src/control/security/pem_test.go index bcaf1b8207c..b4cca6ab396 100644 --- a/src/control/security/pem_test.go +++ b/src/control/security/pem_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package security diff --git a/src/control/security/signature.go b/src/control/security/signature.go index 0ca31f49e2c..561298ad2b6 100644 --- a/src/control/security/signature.go +++ b/src/control/security/signature.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package security diff --git a/src/control/security/signature_test.go b/src/control/security/signature_test.go index 74f43e5c18e..e639eb0cd6b 100644 --- a/src/control/security/signature_test.go +++ b/src/control/security/signature_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package security diff --git a/src/control/server/config/faults.go b/src/control/server/config/faults.go index 21ebe55422c..3f163ae8496 100644 --- a/src/control/server/config/faults.go +++ b/src/control/server/config/faults.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package config diff --git a/src/control/server/config/loglevel.go b/src/control/server/config/loglevel.go index e02de711d54..7461cbd0f8d 100644 --- a/src/control/server/config/loglevel.go +++ b/src/control/server/config/loglevel.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package config diff --git a/src/control/server/config/server.go b/src/control/server/config/server.go index 4401ae5edc0..5f951c15cdb 100644 --- a/src/control/server/config/server.go +++ b/src/control/server/config/server.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package config diff --git a/src/control/server/config/server_test.go b/src/control/server/config/server_test.go index a8220efbb6e..dc111b57253 100644 --- a/src/control/server/config/server_test.go +++ b/src/control/server/config/server_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package config diff --git a/src/control/server/ctl_firmware.go b/src/control/server/ctl_firmware.go index a7c1215b992..33a88fc1574 100644 --- a/src/control/server/ctl_firmware.go +++ b/src/control/server/ctl_firmware.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2020-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build firmware package server diff --git a/src/control/server/ctl_firmware_disabled.go b/src/control/server/ctl_firmware_disabled.go index 114bb268c77..e29a3b59baf 100644 --- a/src/control/server/ctl_firmware_disabled.go +++ b/src/control/server/ctl_firmware_disabled.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2020-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build !firmware package server diff --git a/src/control/server/ctl_firmware_disabled_test.go b/src/control/server/ctl_firmware_disabled_test.go index ce4df587a0b..62dd829ab4e 100644 --- a/src/control/server/ctl_firmware_disabled_test.go +++ b/src/control/server/ctl_firmware_disabled_test.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2020-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build !firmware package server diff --git a/src/control/server/ctl_firmware_test.go b/src/control/server/ctl_firmware_test.go index 42ad7017035..d8ce09af4a3 100644 --- a/src/control/server/ctl_firmware_test.go +++ b/src/control/server/ctl_firmware_test.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2020-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build firmware package server diff --git a/src/control/server/ctl_network_rpc.go b/src/control/server/ctl_network_rpc.go index b66ca84200b..b1db76561a9 100644 --- a/src/control/server/ctl_network_rpc.go +++ b/src/control/server/ctl_network_rpc.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/ctl_network_rpc_test.go b/src/control/server/ctl_network_rpc_test.go index 3f55e0536a9..4137096ecf5 100644 --- a/src/control/server/ctl_network_rpc_test.go +++ b/src/control/server/ctl_network_rpc_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/ctl_ranks_rpc.go b/src/control/server/ctl_ranks_rpc.go index df0f3d032d9..05fc0c88170 100644 --- a/src/control/server/ctl_ranks_rpc.go +++ b/src/control/server/ctl_ranks_rpc.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/ctl_ranks_rpc_test.go b/src/control/server/ctl_ranks_rpc_test.go index c958fef29f4..51ee232d9b4 100644 --- a/src/control/server/ctl_ranks_rpc_test.go +++ b/src/control/server/ctl_ranks_rpc_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/ctl_smd_rpc.go b/src/control/server/ctl_smd_rpc.go index e3f95fd7eda..c1243e73ad3 100644 --- a/src/control/server/ctl_smd_rpc.go +++ b/src/control/server/ctl_smd_rpc.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/ctl_smd_rpc_test.go b/src/control/server/ctl_smd_rpc_test.go index f7fa36ea626..71c2c8a4ed5 100644 --- a/src/control/server/ctl_smd_rpc_test.go +++ b/src/control/server/ctl_smd_rpc_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/ctl_storage.go b/src/control/server/ctl_storage.go index 9f74c963392..59a77933532 100644 --- a/src/control/server/ctl_storage.go +++ b/src/control/server/ctl_storage.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/ctl_storage_rpc.go b/src/control/server/ctl_storage_rpc.go index a62c03f73c9..1f99ec61bb2 100644 --- a/src/control/server/ctl_storage_rpc.go +++ b/src/control/server/ctl_storage_rpc.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/ctl_storage_rpc_test.go b/src/control/server/ctl_storage_rpc_test.go index a366646a990..507ad02c3bd 100644 --- a/src/control/server/ctl_storage_rpc_test.go +++ b/src/control/server/ctl_storage_rpc_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/ctl_storage_test.go b/src/control/server/ctl_storage_test.go index 991e9762493..09b1e29826b 100644 --- a/src/control/server/ctl_storage_test.go +++ b/src/control/server/ctl_storage_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/ctl_svc.go b/src/control/server/ctl_svc.go index 90b0f4a0cec..487a7bba903 100644 --- a/src/control/server/ctl_svc.go +++ b/src/control/server/ctl_svc.go @@ -1,24 +1,7 @@ // // (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/ctl_svc_test.go b/src/control/server/ctl_svc_test.go index a25f5e04197..3d5769d58f0 100644 --- a/src/control/server/ctl_svc_test.go +++ b/src/control/server/ctl_svc_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/drpc.go b/src/control/server/drpc.go index f69c46094d6..f7e3615f717 100644 --- a/src/control/server/drpc.go +++ b/src/control/server/drpc.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/drpc_test.go b/src/control/server/drpc_test.go index f4f4ee6fccb..f095a3f0f49 100644 --- a/src/control/server/drpc_test.go +++ b/src/control/server/drpc_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/faultdomain.go b/src/control/server/faultdomain.go index 873e238b561..2d07c2e9dc2 100644 --- a/src/control/server/faultdomain.go +++ b/src/control/server/faultdomain.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/faultdomain_test.go b/src/control/server/faultdomain_test.go index 465404aec41..168e124d2f6 100644 --- a/src/control/server/faultdomain_test.go +++ b/src/control/server/faultdomain_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/faults.go b/src/control/server/faults.go index a0d5dcd6315..9030a821c6a 100644 --- a/src/control/server/faults.go +++ b/src/control/server/faults.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/harness.go b/src/control/server/harness.go index b943a30cc79..5d091f79d1e 100644 --- a/src/control/server/harness.go +++ b/src/control/server/harness.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/harness_test.go b/src/control/server/harness_test.go index 08b51575268..bdbdb104d6a 100644 --- a/src/control/server/harness_test.go +++ b/src/control/server/harness_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/hugepages.go b/src/control/server/hugepages.go index d09d00dc377..82b8e98b13f 100644 --- a/src/control/server/hugepages.go +++ b/src/control/server/hugepages.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/hugepages_test.go b/src/control/server/hugepages_test.go index 51cd85d6dbd..0e0ef3d61e3 100644 --- a/src/control/server/hugepages_test.go +++ b/src/control/server/hugepages_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/instance.go b/src/control/server/instance.go index 825201c8dc7..de5e4c53792 100644 --- a/src/control/server/instance.go +++ b/src/control/server/instance.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/instance_drpc.go b/src/control/server/instance_drpc.go index ff29f80725a..0f5fa65e914 100644 --- a/src/control/server/instance_drpc.go +++ b/src/control/server/instance_drpc.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/instance_drpc_test.go b/src/control/server/instance_drpc_test.go index ca63a5e3e5c..ee8616bba2c 100644 --- a/src/control/server/instance_drpc_test.go +++ b/src/control/server/instance_drpc_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/instance_exec.go b/src/control/server/instance_exec.go index 259c5d7608d..14013704bf7 100644 --- a/src/control/server/instance_exec.go +++ b/src/control/server/instance_exec.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/instance_storage.go b/src/control/server/instance_storage.go index 3d78f5b3dec..53427efa6b4 100644 --- a/src/control/server/instance_storage.go +++ b/src/control/server/instance_storage.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/instance_storage_rpc.go b/src/control/server/instance_storage_rpc.go index 1b0728c1738..bd0732ff52e 100644 --- a/src/control/server/instance_storage_rpc.go +++ b/src/control/server/instance_storage_rpc.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/instance_storage_test.go b/src/control/server/instance_storage_test.go index 959661db8cc..fbadbcd01d5 100644 --- a/src/control/server/instance_storage_test.go +++ b/src/control/server/instance_storage_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/instance_superblock.go b/src/control/server/instance_superblock.go index 1ae132bb011..2f3c896626d 100644 --- a/src/control/server/instance_superblock.go +++ b/src/control/server/instance_superblock.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/instance_superblock_test.go b/src/control/server/instance_superblock_test.go index f771431a097..55bced1f0f0 100644 --- a/src/control/server/instance_superblock_test.go +++ b/src/control/server/instance_superblock_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/instance_test.go b/src/control/server/instance_test.go index 803d08cccac..a33988983fc 100644 --- a/src/control/server/instance_test.go +++ b/src/control/server/instance_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/interceptors.go b/src/control/server/interceptors.go index 488389dd72d..a7807a879ea 100644 --- a/src/control/server/interceptors.go +++ b/src/control/server/interceptors.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/interceptors_test.go b/src/control/server/interceptors_test.go index 627c48ee672..696884164b9 100644 --- a/src/control/server/interceptors_test.go +++ b/src/control/server/interceptors_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/ioserver/config.go b/src/control/server/ioserver/config.go index bae31659dc5..79cd69dc0ba 100644 --- a/src/control/server/ioserver/config.go +++ b/src/control/server/ioserver/config.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package ioserver diff --git a/src/control/server/ioserver/config_test.go b/src/control/server/ioserver/config_test.go index 08975e69590..546b98609b3 100644 --- a/src/control/server/ioserver/config_test.go +++ b/src/control/server/ioserver/config_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package ioserver diff --git a/src/control/server/ioserver/exec.go b/src/control/server/ioserver/exec.go index 33753a0f37b..47684189bde 100644 --- a/src/control/server/ioserver/exec.go +++ b/src/control/server/ioserver/exec.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package ioserver diff --git a/src/control/server/ioserver/exec_test.go b/src/control/server/ioserver/exec_test.go index e345be452d1..6faab128010 100644 --- a/src/control/server/ioserver/exec_test.go +++ b/src/control/server/ioserver/exec_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package ioserver diff --git a/src/control/server/ioserver/mocks.go b/src/control/server/ioserver/mocks.go index c834f9ab84d..55337f1e12a 100644 --- a/src/control/server/ioserver/mocks.go +++ b/src/control/server/ioserver/mocks.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package ioserver diff --git a/src/control/server/ioserver/tags.go b/src/control/server/ioserver/tags.go index 82bc78641bd..e2749f07afa 100644 --- a/src/control/server/ioserver/tags.go +++ b/src/control/server/ioserver/tags.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package ioserver diff --git a/src/control/server/ioserver/tags_test.go b/src/control/server/ioserver/tags_test.go index 99c89b9da57..79906e38a8d 100644 --- a/src/control/server/ioserver/tags_test.go +++ b/src/control/server/ioserver/tags_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package ioserver diff --git a/src/control/server/ioserver/util.go b/src/control/server/ioserver/util.go index a9ea46b90aa..d1d5d384d58 100644 --- a/src/control/server/ioserver/util.go +++ b/src/control/server/ioserver/util.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package ioserver diff --git a/src/control/server/mgmt_cont.go b/src/control/server/mgmt_cont.go index 618232e5a2c..2bddbf2df8d 100644 --- a/src/control/server/mgmt_cont.go +++ b/src/control/server/mgmt_cont.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/mgmt_cont_test.go b/src/control/server/mgmt_cont_test.go index a951e3a6efd..5f8eb8ebdfd 100644 --- a/src/control/server/mgmt_cont_test.go +++ b/src/control/server/mgmt_cont_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/mgmt_drpc.go b/src/control/server/mgmt_drpc.go index 40bcfafe2be..d038a79b1fc 100644 --- a/src/control/server/mgmt_drpc.go +++ b/src/control/server/mgmt_drpc.go @@ -1,24 +1,7 @@ // // (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/mgmt_drpc_test.go b/src/control/server/mgmt_drpc_test.go index cf563e910d1..15ff4584651 100644 --- a/src/control/server/mgmt_drpc_test.go +++ b/src/control/server/mgmt_drpc_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/mgmt_pool.go b/src/control/server/mgmt_pool.go index fe3f4ce5309..b931a2d352e 100644 --- a/src/control/server/mgmt_pool.go +++ b/src/control/server/mgmt_pool.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/mgmt_pool_test.go b/src/control/server/mgmt_pool_test.go index 4f86bfa526d..b32942514dc 100644 --- a/src/control/server/mgmt_pool_test.go +++ b/src/control/server/mgmt_pool_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/mgmt_svc.go b/src/control/server/mgmt_svc.go index a5fbc132c57..828afdfc4fc 100644 --- a/src/control/server/mgmt_svc.go +++ b/src/control/server/mgmt_svc.go @@ -1,24 +1,7 @@ // // (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/mgmt_svc_test.go b/src/control/server/mgmt_svc_test.go index 7b9c3d6f81f..ab39527adb1 100644 --- a/src/control/server/mgmt_svc_test.go +++ b/src/control/server/mgmt_svc_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/mgmt_system.go b/src/control/server/mgmt_system.go index f2142aa928c..82d79672568 100644 --- a/src/control/server/mgmt_system.go +++ b/src/control/server/mgmt_system.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/mgmt_system_test.go b/src/control/server/mgmt_system_test.go index 82ae1f19e88..bc4e3c616d5 100644 --- a/src/control/server/mgmt_system_test.go +++ b/src/control/server/mgmt_system_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/security_rpc.go b/src/control/server/security_rpc.go index 444dab25830..eab77c9db70 100644 --- a/src/control/server/security_rpc.go +++ b/src/control/server/security_rpc.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/security_rpc_test.go b/src/control/server/security_rpc_test.go index c346a0d7515..d566bcde447 100644 --- a/src/control/server/security_rpc_test.go +++ b/src/control/server/security_rpc_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/server.go b/src/control/server/server.go index f7c67610f44..ad83c768002 100644 --- a/src/control/server/server.go +++ b/src/control/server/server.go @@ -1,24 +1,7 @@ // // (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/server/storage/bdev/backend.go b/src/control/server/storage/bdev/backend.go index 1add7d0f8d7..840702a49ae 100644 --- a/src/control/server/storage/bdev/backend.go +++ b/src/control/server/storage/bdev/backend.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package bdev diff --git a/src/control/server/storage/bdev/backend_test.go b/src/control/server/storage/bdev/backend_test.go index f7c5ff8c64c..d0f2fc3b4fd 100644 --- a/src/control/server/storage/bdev/backend_test.go +++ b/src/control/server/storage/bdev/backend_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package bdev diff --git a/src/control/server/storage/bdev/class.go b/src/control/server/storage/bdev/class.go index 95266adc2b6..4d8a6a45a99 100644 --- a/src/control/server/storage/bdev/class.go +++ b/src/control/server/storage/bdev/class.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package bdev diff --git a/src/control/server/storage/bdev/class_test.go b/src/control/server/storage/bdev/class_test.go index 5aa8c08b1e9..292e4a40299 100644 --- a/src/control/server/storage/bdev/class_test.go +++ b/src/control/server/storage/bdev/class_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2018-2020 Intel Corporation. +// (C) Copyright 2018-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package bdev diff --git a/src/control/server/storage/bdev/faults.go b/src/control/server/storage/bdev/faults.go index 4ccd9b48b11..da92e1ab24a 100644 --- a/src/control/server/storage/bdev/faults.go +++ b/src/control/server/storage/bdev/faults.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package bdev diff --git a/src/control/server/storage/bdev/firmware.go b/src/control/server/storage/bdev/firmware.go index f9ff35021c8..72c67ff53d9 100644 --- a/src/control/server/storage/bdev/firmware.go +++ b/src/control/server/storage/bdev/firmware.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2020-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build firmware package bdev diff --git a/src/control/server/storage/bdev/firmware_disabled.go b/src/control/server/storage/bdev/firmware_disabled.go index 1aaa71ddf3a..0756a13bd06 100644 --- a/src/control/server/storage/bdev/firmware_disabled.go +++ b/src/control/server/storage/bdev/firmware_disabled.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2020-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build !firmware package bdev diff --git a/src/control/server/storage/bdev/firmware_test.go b/src/control/server/storage/bdev/firmware_test.go index da8dfb0d001..4bf038b4a55 100644 --- a/src/control/server/storage/bdev/firmware_test.go +++ b/src/control/server/storage/bdev/firmware_test.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2020-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build firmware package bdev diff --git a/src/control/server/storage/bdev/forwarder.go b/src/control/server/storage/bdev/forwarder.go index f8709cf7af3..5b672150ae7 100644 --- a/src/control/server/storage/bdev/forwarder.go +++ b/src/control/server/storage/bdev/forwarder.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package bdev diff --git a/src/control/server/storage/bdev/mocks.go b/src/control/server/storage/bdev/mocks.go index 83a5d1ac029..32e846bfc11 100644 --- a/src/control/server/storage/bdev/mocks.go +++ b/src/control/server/storage/bdev/mocks.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package bdev diff --git a/src/control/server/storage/bdev/provider.go b/src/control/server/storage/bdev/provider.go index 1e1c718defb..757cd099a77 100644 --- a/src/control/server/storage/bdev/provider.go +++ b/src/control/server/storage/bdev/provider.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package bdev diff --git a/src/control/server/storage/bdev/provider_test.go b/src/control/server/storage/bdev/provider_test.go index 6a268a04107..fe9a17cddd2 100644 --- a/src/control/server/storage/bdev/provider_test.go +++ b/src/control/server/storage/bdev/provider_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package bdev diff --git a/src/control/server/storage/bdev/runner.go b/src/control/server/storage/bdev/runner.go index f6a90a1b55c..48c1db5b934 100644 --- a/src/control/server/storage/bdev/runner.go +++ b/src/control/server/storage/bdev/runner.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package bdev diff --git a/src/control/server/storage/bdev/runner_test.go b/src/control/server/storage/bdev/runner_test.go index 14f2b766b79..ab2ae07c47c 100644 --- a/src/control/server/storage/bdev/runner_test.go +++ b/src/control/server/storage/bdev/runner_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package bdev diff --git a/src/control/server/storage/config.go b/src/control/server/storage/config.go index a3864368434..b14c677624f 100644 --- a/src/control/server/storage/config.go +++ b/src/control/server/storage/config.go @@ -1,24 +1,7 @@ // // (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package storage diff --git a/src/control/server/storage/mocks.go b/src/control/server/storage/mocks.go index 9aca20a22c4..3f59110e8db 100644 --- a/src/control/server/storage/mocks.go +++ b/src/control/server/storage/mocks.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package storage diff --git a/src/control/server/storage/scm/faults.go b/src/control/server/storage/scm/faults.go index b70b8ccfe7f..c7c8c357c28 100644 --- a/src/control/server/storage/scm/faults.go +++ b/src/control/server/storage/scm/faults.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package scm diff --git a/src/control/server/storage/scm/firmware.go b/src/control/server/storage/scm/firmware.go index 7d60c33bbd1..17340c94583 100644 --- a/src/control/server/storage/scm/firmware.go +++ b/src/control/server/storage/scm/firmware.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2020-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build firmware package scm diff --git a/src/control/server/storage/scm/firmware_disabled.go b/src/control/server/storage/scm/firmware_disabled.go index 8c33cc8cf5e..0f947362d9e 100644 --- a/src/control/server/storage/scm/firmware_disabled.go +++ b/src/control/server/storage/scm/firmware_disabled.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2020-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build !firmware package scm diff --git a/src/control/server/storage/scm/firmware_test.go b/src/control/server/storage/scm/firmware_test.go index 057bacba6a1..957a0f52578 100644 --- a/src/control/server/storage/scm/firmware_test.go +++ b/src/control/server/storage/scm/firmware_test.go @@ -1,25 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. -// -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// (C) Copyright 2020-2021 Intel Corporation. // +// SPDX-License-Identifier: BSD-2-Clause-Patent // +build firmware package scm diff --git a/src/control/server/storage/scm/forwarder.go b/src/control/server/storage/scm/forwarder.go index f7e5f293242..66dbd2bbccf 100644 --- a/src/control/server/storage/scm/forwarder.go +++ b/src/control/server/storage/scm/forwarder.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package scm diff --git a/src/control/server/storage/scm/ipmctl.go b/src/control/server/storage/scm/ipmctl.go index ea5536d00fc..ab551dcb83f 100644 --- a/src/control/server/storage/scm/ipmctl.go +++ b/src/control/server/storage/scm/ipmctl.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package scm diff --git a/src/control/server/storage/scm/ipmctl_test.go b/src/control/server/storage/scm/ipmctl_test.go index 2e36afc0cf0..f9efb82fd03 100644 --- a/src/control/server/storage/scm/ipmctl_test.go +++ b/src/control/server/storage/scm/ipmctl_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package scm diff --git a/src/control/server/storage/scm/mocks.go b/src/control/server/storage/scm/mocks.go index b06c96d8ffd..5154f15939c 100644 --- a/src/control/server/storage/scm/mocks.go +++ b/src/control/server/storage/scm/mocks.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package scm diff --git a/src/control/server/storage/scm/provider.go b/src/control/server/storage/scm/provider.go index 2dd9bfc7398..899f9c76ac0 100644 --- a/src/control/server/storage/scm/provider.go +++ b/src/control/server/storage/scm/provider.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package scm diff --git a/src/control/server/storage/scm/provider_test.go b/src/control/server/storage/scm/provider_test.go index bb4873038bb..8a42db571a0 100644 --- a/src/control/server/storage/scm/provider_test.go +++ b/src/control/server/storage/scm/provider_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package scm diff --git a/src/control/server/storage/types.go b/src/control/server/storage/types.go index d3ad6abe015..0446aa3a0c5 100644 --- a/src/control/server/storage/types.go +++ b/src/control/server/storage/types.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package storage diff --git a/src/control/server/test_utils.go b/src/control/server/test_utils.go index d16edc01896..e23be853416 100644 --- a/src/control/server/test_utils.go +++ b/src/control/server/test_utils.go @@ -1,24 +1,7 @@ // // (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package server diff --git a/src/control/system/database.go b/src/control/system/database.go index eacd18b886a..6ace56a8af7 100644 --- a/src/control/system/database.go +++ b/src/control/system/database.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/system/database_members.go b/src/control/system/database_members.go index 093559a1450..f9b88bebd0d 100644 --- a/src/control/system/database_members.go +++ b/src/control/system/database_members.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/system/database_pools.go b/src/control/system/database_pools.go index 9ed3f7a4538..ce9e2347359 100644 --- a/src/control/system/database_pools.go +++ b/src/control/system/database_pools.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/system/database_test.go b/src/control/system/database_test.go index 8d48651394b..bc692432dd8 100644 --- a/src/control/system/database_test.go +++ b/src/control/system/database_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/system/errors.go b/src/control/system/errors.go index 631456b8b7a..1341a2dbba8 100644 --- a/src/control/system/errors.go +++ b/src/control/system/errors.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/system/faultdomain.go b/src/control/system/faultdomain.go index 597b1acfd10..972927c88ac 100644 --- a/src/control/system/faultdomain.go +++ b/src/control/system/faultdomain.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/system/faultdomain_test.go b/src/control/system/faultdomain_test.go index a3c1e6dfb40..1dfa6f50831 100644 --- a/src/control/system/faultdomain_test.go +++ b/src/control/system/faultdomain_test.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/system/hclogger.go b/src/control/system/hclogger.go index eef2a0cef53..260c97080bd 100644 --- a/src/control/system/hclogger.go +++ b/src/control/system/hclogger.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/system/member.go b/src/control/system/member.go index b4e09d3fb62..72c72c973d1 100644 --- a/src/control/system/member.go +++ b/src/control/system/member.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/system/member_test.go b/src/control/system/member_test.go index 4a5ebacc5ff..0e5cf646c57 100644 --- a/src/control/system/member_test.go +++ b/src/control/system/member_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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 -// -// c6xuplcrnless 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/system/membership.go b/src/control/system/membership.go index 83420003b70..e86ed702f30 100644 --- a/src/control/system/membership.go +++ b/src/control/system/membership.go @@ -1,24 +1,7 @@ // // (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/system/membership_test.go b/src/control/system/membership_test.go index 92d58be1012..e5c04ebc6be 100644 --- a/src/control/system/membership_test.go +++ b/src/control/system/membership_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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 -// -// c6xuplcrnless 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/system/mocks.go b/src/control/system/mocks.go index 67b331ea774..ce33fb71f8a 100644 --- a/src/control/system/mocks.go +++ b/src/control/system/mocks.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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 -// -// c6xuplcrnless 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/system/raft.go b/src/control/system/raft.go index a2535fe3cd5..18df26a345c 100644 --- a/src/control/system/raft.go +++ b/src/control/system/raft.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/system/rank.go b/src/control/system/rank.go index e86041bfb54..81e40c230a3 100644 --- a/src/control/system/rank.go +++ b/src/control/system/rank.go @@ -1,24 +1,7 @@ // // (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/system/rank_test.go b/src/control/system/rank_test.go index 456f73ff9df..b9094304216 100644 --- a/src/control/system/rank_test.go +++ b/src/control/system/rank_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2019-2020 Intel Corporation. +// (C) Copyright 2019-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/system/ranklist.go b/src/control/system/ranklist.go index 1474ea345dc..797f0dae4ff 100644 --- a/src/control/system/ranklist.go +++ b/src/control/system/ranklist.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/system/ranklist_test.go b/src/control/system/ranklist_test.go index c6b60fa82b6..fe5337feb81 100644 --- a/src/control/system/ranklist_test.go +++ b/src/control/system/ranklist_test.go @@ -1,24 +1,7 @@ // -// (C) Copyright 2020 Intel Corporation. +// (C) Copyright 2020-2021 Intel Corporation. // -// 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. -// -// GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -// The Government's rights to use, modify, reproduce, release, perform, display, -// or disclose this software are subject to the terms of the Apache License as -// provided in Contract No. 8F-30005. -// Any reproduction of computer software, computer software documentation, or -// portions thereof marked with this legend must also reproduce the markings. +// SPDX-License-Identifier: BSD-2-Clause-Patent // package system diff --git a/src/control/vendor/google.golang.org/genproto/googleapis/rpc/errdetails/error_details.pb.go b/src/control/vendor/google.golang.org/genproto/googleapis/rpc/errdetails/error_details.pb.go index b92594619d1..c9cef401813 100644 --- a/src/control/vendor/google.golang.org/genproto/googleapis/rpc/errdetails/error_details.pb.go +++ b/src/control/vendor/google.golang.org/genproto/googleapis/rpc/errdetails/error_details.pb.go @@ -1,15 +1,6 @@ // Copyright 2020 Google LLC // -// 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 +// SPDX-License-Identifier: BSD-2-Clause-Patent // limitations under the License. // Code generated by protoc-gen-go. DO NOT EDIT. diff --git a/src/control/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go b/src/control/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go index 063d724cb56..874301a33ee 100644 --- a/src/control/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go +++ b/src/control/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go @@ -1,15 +1,6 @@ // Copyright 2020 Google LLC // -// 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 +// SPDX-License-Identifier: BSD-2-Clause-Patent // limitations under the License. // Code generated by protoc-gen-go. DO NOT EDIT. From 78e61e4ae912a70abd49bee0be88afea4b6c0790 Mon Sep 17 00:00:00 2001 From: Hua Kuang Date: Wed, 20 Jan 2021 18:23:51 +0000 Subject: [PATCH 2/3] DAOS-6338 DAOS:Change DAOS license text #3 Fixed some left over head comments. Skip-build: true Skip-test: true Change-Id: I5e906f5f3a5dfd6f5288643d08924c156daf36eb Signed-off-by: Hua Kuang --- src/control/cmd/daos_agent/procmon.go | 2 +- src/control/cmd/dmg/json_test.go | 2 +- src/control/drpc/drpc_server.go | 2 +- src/control/drpc/drpc_server_test.go | 2 +- src/control/drpc/failure.go | 2 +- src/control/drpc/failure_test.go | 2 +- src/control/drpc/mocks_test.go | 2 +- src/control/drpc/module_svc.go | 2 +- src/control/drpc/module_svc_test.go | 2 +- src/control/lib/txtfmt/writer.go | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/control/cmd/daos_agent/procmon.go b/src/control/cmd/daos_agent/procmon.go index 8ce634f7612..2c832d7ab36 100644 --- a/src/control/cmd/daos_agent/procmon.go +++ b/src/control/cmd/daos_agent/procmon.go @@ -2,7 +2,7 @@ // (C) Copyright 2020-2021 Intel Corporation. // // SPDX-License-Identifier: BSD-2-Clause-Patent -// portions thereof marked with this legend must also reproduce the markings. +// package main diff --git a/src/control/cmd/dmg/json_test.go b/src/control/cmd/dmg/json_test.go index 779206b15bc..0d75b5d4deb 100644 --- a/src/control/cmd/dmg/json_test.go +++ b/src/control/cmd/dmg/json_test.go @@ -2,7 +2,7 @@ // (C) Copyright 2020-2021 Intel Corporation. // // SPDX-License-Identifier: BSD-2-Clause-Patent -// portions thereof marked with this legend must also reproduce the markings. +// package main diff --git a/src/control/drpc/drpc_server.go b/src/control/drpc/drpc_server.go index 7e36a66f589..4650c004f61 100644 --- a/src/control/drpc/drpc_server.go +++ b/src/control/drpc/drpc_server.go @@ -2,7 +2,7 @@ // (C) Copyright 2018-2021 Intel Corporation. // // SPDX-License-Identifier: BSD-2-Clause-Patent -// portions thereof marked with this legend must also reproduce the markings. +// package drpc diff --git a/src/control/drpc/drpc_server_test.go b/src/control/drpc/drpc_server_test.go index eb11f5e8c31..15f12a34192 100644 --- a/src/control/drpc/drpc_server_test.go +++ b/src/control/drpc/drpc_server_test.go @@ -2,7 +2,7 @@ // (C) Copyright 2019-2021 Intel Corporation. // // SPDX-License-Identifier: BSD-2-Clause-Patent -// portions thereof marked with this legend must also reproduce the markings. +// package drpc diff --git a/src/control/drpc/failure.go b/src/control/drpc/failure.go index 024d54a078e..ed22233f2d8 100644 --- a/src/control/drpc/failure.go +++ b/src/control/drpc/failure.go @@ -2,7 +2,7 @@ // (C) Copyright 2018-2021 Intel Corporation. // // SPDX-License-Identifier: BSD-2-Clause-Patent -// portions thereof marked with this legend must also reproduce the markings. +// package drpc diff --git a/src/control/drpc/failure_test.go b/src/control/drpc/failure_test.go index 666f2c6d1bb..875eeafdaba 100644 --- a/src/control/drpc/failure_test.go +++ b/src/control/drpc/failure_test.go @@ -2,7 +2,7 @@ // (C) Copyright 2019-2021 Intel Corporation. // // SPDX-License-Identifier: BSD-2-Clause-Patent -// portions thereof marked with this legend must also reproduce the markings. +// package drpc diff --git a/src/control/drpc/mocks_test.go b/src/control/drpc/mocks_test.go index 94e479926c9..55a707ccdf8 100644 --- a/src/control/drpc/mocks_test.go +++ b/src/control/drpc/mocks_test.go @@ -2,7 +2,7 @@ // (C) Copyright 2019-2021 Intel Corporation. // // SPDX-License-Identifier: BSD-2-Clause-Patent -// portions thereof marked with this legend must also reproduce the markings. +// package drpc diff --git a/src/control/drpc/module_svc.go b/src/control/drpc/module_svc.go index 6d533816967..7c5a8658dba 100644 --- a/src/control/drpc/module_svc.go +++ b/src/control/drpc/module_svc.go @@ -2,7 +2,7 @@ // (C) Copyright 2018-2021 Intel Corporation. // // SPDX-License-Identifier: BSD-2-Clause-Patent -// portions thereof marked with this legend must also reproduce the markings. +// package drpc diff --git a/src/control/drpc/module_svc_test.go b/src/control/drpc/module_svc_test.go index 9ba177b9194..d9d0102b9c2 100644 --- a/src/control/drpc/module_svc_test.go +++ b/src/control/drpc/module_svc_test.go @@ -2,7 +2,7 @@ // (C) Copyright 2019-2021 Intel Corporation. // // SPDX-License-Identifier: BSD-2-Clause-Patent -// portions thereof marked with this legend must also reproduce the markings. +// package drpc diff --git a/src/control/lib/txtfmt/writer.go b/src/control/lib/txtfmt/writer.go index fd493641222..001f16449cc 100644 --- a/src/control/lib/txtfmt/writer.go +++ b/src/control/lib/txtfmt/writer.go @@ -2,7 +2,7 @@ // (C) Copyright 2020-2021 Intel Corporation. // // SPDX-License-Identifier: BSD-2-Clause-Patent -// portions thereof marked with this legend must also reproduce the markings. +// package txtfmt From af8f396661c601ae9a82e2e43c2b0bd58d266e3e Mon Sep 17 00:00:00 2001 From: Hua Kuang Date: Wed, 20 Jan 2021 21:52:40 +0000 Subject: [PATCH 3/3] DAOS-6338 DAOS:Change DAOS license text Fixed some script missed changes and reverted some suto generated files. Skip-build: true Skip-test: true Change-Id: Ie419da4034d0dc823c06e457597f0211fc7409a7 Signed-off-by: Hua Kuang --- src/control/lib/spdk/ctests/nvme_control_ut.c | 25 +++++++++++++++++++ src/control/lib/spdk/include/nvme_control.h | 10 ++++++++ .../lib/spdk/include/nvme_control_common.h | 11 ++++++++ .../rpc/errdetails/error_details.pb.go | 11 +++++++- .../googleapis/rpc/status/status.pb.go | 11 +++++++- 5 files changed, 66 insertions(+), 2 deletions(-) diff --git a/src/control/lib/spdk/ctests/nvme_control_ut.c b/src/control/lib/spdk/ctests/nvme_control_ut.c index 234cb8cfbe6..93e751a93b6 100644 --- a/src/control/lib/spdk/ctests/nvme_control_ut.c +++ b/src/control/lib/spdk/ctests/nvme_control_ut.c @@ -2,6 +2,31 @@ * (C) Copyright 2019-2021 Intel Corporation. * * SPDX-License-Identifier: BSD-2-Clause-Patent +*/ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include "nvme_internal.h" + +#include "../include/nvme_control_common.h" + +#if D_HAS_WARNING(4, "-Wframe-larger-than=") + #pragma GCC diagnostic ignored "-Wframe-larger-than=" +#endif + +static struct ret_t *test_ret; + +/** + * ============================== + * nvme_control mock functions + * ============================== */ static int diff --git a/src/control/lib/spdk/include/nvme_control.h b/src/control/lib/spdk/include/nvme_control.h index 33cb7b5588e..cb8e1bd17fb 100644 --- a/src/control/lib/spdk/include/nvme_control.h +++ b/src/control/lib/spdk/include/nvme_control.h @@ -2,6 +2,16 @@ * (C) Copyright 2018-2021 Intel Corporation. * * SPDX-License-Identifier: BSD-2-Clause-Patent +*/ + +#ifndef NVMECONTROL_H +#define NVMECONTROL_H + +/** + * Discover NVMe controllers and namespaces, as well as return device health + * information. + * + * \return a pointer to a return struct (ret_t). */ struct ret_t * nvme_discover(void); diff --git a/src/control/lib/spdk/include/nvme_control_common.h b/src/control/lib/spdk/include/nvme_control_common.h index a0c83540fae..b2e38206ccc 100644 --- a/src/control/lib/spdk/include/nvme_control_common.h +++ b/src/control/lib/spdk/include/nvme_control_common.h @@ -2,6 +2,17 @@ * (C) Copyright 2019-2021 Intel Corporation. * * SPDX-License-Identifier: BSD-2-Clause-Patent +*/ + +#ifndef NVMECONTROL_COMMON_H +#define NVMECONTROL_COMMON_H + +#include + +#define BUFLEN 1024 + +/** + * \brief NVMECONTROL return codes */ enum nvme_control_status_code { NVMEC_SUCCESS = 0x0, diff --git a/src/control/vendor/google.golang.org/genproto/googleapis/rpc/errdetails/error_details.pb.go b/src/control/vendor/google.golang.org/genproto/googleapis/rpc/errdetails/error_details.pb.go index c9cef401813..b92594619d1 100644 --- a/src/control/vendor/google.golang.org/genproto/googleapis/rpc/errdetails/error_details.pb.go +++ b/src/control/vendor/google.golang.org/genproto/googleapis/rpc/errdetails/error_details.pb.go @@ -1,6 +1,15 @@ // Copyright 2020 Google LLC // -// SPDX-License-Identifier: BSD-2-Clause-Patent +// 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. // Code generated by protoc-gen-go. DO NOT EDIT. diff --git a/src/control/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go b/src/control/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go index 874301a33ee..063d724cb56 100644 --- a/src/control/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go +++ b/src/control/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go @@ -1,6 +1,15 @@ // Copyright 2020 Google LLC // -// SPDX-License-Identifier: BSD-2-Clause-Patent +// 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. // Code generated by protoc-gen-go. DO NOT EDIT.