Merge "Updates/Fix on Legal/License Headers"

diff --combined docker/ansible/roles/config_files/tasks/main.yml
index aa12b7d,e6b6dbf..3221242
--- 1/docker/ansible/roles/config_files/tasks/main.yml
--- 2/docker/ansible/roles/config_files/tasks/main.yml
+++ b/docker/ansible/roles/config_files/tasks/main.yml
@@@ -1,16 -1,17 +1,17 @@@
- #Copyright 2018 OPNFV and Intel Corporation
+ # Copyright 2018-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.
+ #
  ---
  
  - name: Clean collectd config dir path
@@@ -29,9 -30,6 +30,9 @@@
    tags:
      - always
  
 +- name: enable capabilities plugin
 +  import_tasks: capabilities.yml
 +
  - name: enable csv plugin
    import_tasks: csv.yml
  

diff --combined docker/barometer-collectd-experimental/collectd_apply_pull_request.sh
index ed33711,5144e2f..831aba3
--- 1/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh
--- 2/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh
+++ b/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh
@@@ -1,17 -1,18 +1,18 @@@
  #! /bin/bash
- # Copyright 2019 OPNFV
+ # Copyright 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.
+ #
  
  # This files contains list of pull requests to be applied on top
  # of master branch before building collectd included in docker
@@@ -25,7 -26,6 +26,7 @@@
  
  PULL_REQUESTS=(
      3045 #logparser
 +    3292 #capabilities plugin
      #insert another PR ID here
                )
  

diff --combined src/libpqos/Makefile
index a3a9ba5,58355dd..a64afd2
--- 1/src/libpqos/Makefile
--- 2/src/libpqos/Makefile
+++ b/src/libpqos/Makefile
@@@ -1,19 -1,20 +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:
@@@ -40,9 -41,7 +41,9 @@@ INSTALL_TARGET = force_install force_ma
  force_make: $(WORK_DIR)
        $(AT)cd $(WORK_DIR) && git pull $(LIBPQOS_URL) $(LIBPQOS_TAG)
        @echo "git pull done"
 -      $(AT)$(MAKE) -C $(WORK_DIR) $(MORE_MAKE_FLAGS)
 +      $(AT)$(MAKE) -C $(WORK_DIR)/lib $(MORE_MAKE_FLAGS)
 +      $(AT)$(MAKE) -C $(WORK_DIR)/pqos $(MORE_MAKE_FLAGS)
 +      $(AT)$(MAKE) -C $(WORK_DIR)/rdtset $(MORE_MAKE_FLAGS)
        @echo "Make done"
  
  force_install:

diff --combined systems/centos/7/build_base_machine.sh
index eb09814,a8fc96d..62473fa
--- 1/systems/centos/7/build_base_machine.sh
--- 2/systems/centos/7/build_base_machine.sh
+++ b/systems/centos/7/build_base_machine.sh
@@@ -2,13 -2,13 +2,13 @@@
  #
  # Build a base machine for CentOS distro
  #
- # Copyright 2017-2018 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,
@@@ -16,6 -16,7 +16,7 @@@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  #
+ #
  # Contributors:
  #   Aihua Li, Huawei Technologies.
  #   Martin Klozik, Intel Corporation.
@@@ -55,8 -56,6 +56,8 @@@ mcelo
  wget
  net-snmp-devel
  hiredis-devel
 +libmicrohttpd-devel
 +jansson-devel
  
  # install epel release required for git-review
  epel-release