From 4abee7e46d1602f796f8aebed0a51da9476d0832 Mon Sep 17 00:00:00 2001 From: jabirkkclt Date: Fri, 6 Dec 2019 07:58:29 -0800 Subject: Updates/Fix on Legal/License Headers Signed-off-by: jabirkkclt Change-Id: Id29ba83455d2cea21ec634d3e0eee38d84de465b --- src/Makefile | 5 +++-- src/collectd-openstack-plugins/Makefile | 5 +++-- src/collectd/Makefile | 5 +++-- src/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh | 3 ++- src/collectd/collectd_sample_configs-master/write_notification.sh | 5 +++-- src/collectd/collectd_sample_configs/ovs_pmd_stats.sh | 5 +++-- src/collectd/collectd_sample_configs/write_notification.sh | 5 +++-- src/collectd/include_config.sh | 5 +++-- src/collectd/ovs_pmd_stats_config.sh | 5 +++-- src/collectd/snmp_mib_config.sh | 5 +++-- src/dpdk/Makefile | 5 +++-- src/libpqos/Makefile | 5 +++-- src/librdkafka/Makefile | 5 +++-- src/pmu-tools/Makefile | 5 +++-- 14 files changed, 41 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/Makefile b/src/Makefile index 7c6c17cc..49ce2980 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,19 +1,20 @@ # Top Makefile to build upstream packages. # -# Copyright 2016 OPNFV +# Copyright 2016-2019 Intel Corporation and OPNFV. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# # # Contributors: diff --git a/src/collectd-openstack-plugins/Makefile b/src/collectd-openstack-plugins/Makefile index 96bbebb8..a6745b5f 100644 --- a/src/collectd-openstack-plugins/Makefile +++ b/src/collectd-openstack-plugins/Makefile @@ -1,19 +1,20 @@ # makefile to manage COLLECTD_OPENSTACK package # -# Copyright 2015-2017 OPNFV +# Copyright 2015-2019 Intel Corporation and OPNFV. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# # # Contributors: diff --git a/src/collectd/Makefile b/src/collectd/Makefile index 8eea00fd..7eb312da 100644 --- a/src/collectd/Makefile +++ b/src/collectd/Makefile @@ -1,19 +1,20 @@ # makefile to manage collectd package # -# Copyright 2016-2017 OPNFV +# Copyright 2016-2019 Intel Corporation and OPNFV. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# # # Contributors: diff --git a/src/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh b/src/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh index 0517717f..78e72047 100755 --- a/src/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh +++ b/src/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2017 OPNFV +# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,4 +12,5 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# sudo python /usr/local/src/ovs_pmd_stats.py --socket-pid-file /var/run/openvswitch/ovs-vswitchd.pid diff --git a/src/collectd/collectd_sample_configs-master/write_notification.sh b/src/collectd/collectd_sample_configs-master/write_notification.sh index ed6ed9e2..47ae9a83 100755 --- a/src/collectd/collectd_sample_configs-master/write_notification.sh +++ b/src/collectd/collectd_sample_configs-master/write_notification.sh @@ -1,17 +1,18 @@ #!/bin/bash -# Copyright 2017 OPNFV +# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# rm -f /tmp/notifications while read x y do diff --git a/src/collectd/collectd_sample_configs/ovs_pmd_stats.sh b/src/collectd/collectd_sample_configs/ovs_pmd_stats.sh index 0517717f..d3e83d82 100755 --- a/src/collectd/collectd_sample_configs/ovs_pmd_stats.sh +++ b/src/collectd/collectd_sample_configs/ovs_pmd_stats.sh @@ -1,15 +1,16 @@ #!/bin/bash -# Copyright 2017 OPNFV +# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# sudo python /usr/local/src/ovs_pmd_stats.py --socket-pid-file /var/run/openvswitch/ovs-vswitchd.pid diff --git a/src/collectd/collectd_sample_configs/write_notification.sh b/src/collectd/collectd_sample_configs/write_notification.sh index ed6ed9e2..47ae9a83 100755 --- a/src/collectd/collectd_sample_configs/write_notification.sh +++ b/src/collectd/collectd_sample_configs/write_notification.sh @@ -1,17 +1,18 @@ #!/bin/bash -# Copyright 2017 OPNFV +# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# rm -f /tmp/notifications while read x y do diff --git a/src/collectd/include_config.sh b/src/collectd/include_config.sh index 4f91a453..f8db0dcf 100755 --- a/src/collectd/include_config.sh +++ b/src/collectd/include_config.sh @@ -1,11 +1,11 @@ #!/bin/bash -# Copyright 2017 OPNFV +# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -15,6 +15,7 @@ # Config file options are changing between releases so we have to store both # configurations variants and choose correct one for target collectd version +# if [ -z "$1" ]; then echo "Error! Please sample configs variant name as a param!"\ diff --git a/src/collectd/ovs_pmd_stats_config.sh b/src/collectd/ovs_pmd_stats_config.sh index bdb0615d..5b6f490e 100755 --- a/src/collectd/ovs_pmd_stats_config.sh +++ b/src/collectd/ovs_pmd_stats_config.sh @@ -1,17 +1,18 @@ #!/bin/bash -# Copyright 2017 OPNFV +# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# export CURRENT_DIR=$(pwd) diff --git a/src/collectd/snmp_mib_config.sh b/src/collectd/snmp_mib_config.sh index a2c44db1..a1ff677f 100755 --- a/src/collectd/snmp_mib_config.sh +++ b/src/collectd/snmp_mib_config.sh @@ -1,17 +1,18 @@ #!/bin/bash -# Copyright 2017 OPNFV +# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# export CURRENT_DIR=$(pwd) diff --git a/src/dpdk/Makefile b/src/dpdk/Makefile index 40fa4820..fc6a15d1 100644 --- a/src/dpdk/Makefile +++ b/src/dpdk/Makefile @@ -1,19 +1,20 @@ # makefile to manage dpdk package # -# Copyright 2015-2017 OPNFV +# Copyright 2015-2019 Intel Corporation and OPNFV. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# # # Contributors: diff --git a/src/libpqos/Makefile b/src/libpqos/Makefile index a32a4ab8..58355dd4 100644 --- a/src/libpqos/Makefile +++ b/src/libpqos/Makefile @@ -1,19 +1,20 @@ # makefile to manage collectd package # -# Copyright 2016 OPNFV +# Copyright 2016-2019 Intel Corporation and OPNFV. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# # # Contributors: diff --git a/src/librdkafka/Makefile b/src/librdkafka/Makefile index ea5e34e2..5769e27d 100644 --- a/src/librdkafka/Makefile +++ b/src/librdkafka/Makefile @@ -1,17 +1,18 @@ # makefile to manage collectd package -# Copyright 2017 OPNFV +# Copyright 2016-2019 Intel Corporation and OPNFV. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# # # Contributors: diff --git a/src/pmu-tools/Makefile b/src/pmu-tools/Makefile index ab0d8170..c0fc3030 100644 --- a/src/pmu-tools/Makefile +++ b/src/pmu-tools/Makefile @@ -1,19 +1,20 @@ # makefile to manage collectd package # -# Copyright 2017 OPNFV +# Copyright 2016-2019 Intel Corporation and OPNFV. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# # # Contributors: -- cgit 1.2.3-korg