Merge "Provided the correct path for schema yaml & config files to avoid issues in...

diff --git a/INFO b/INFO
index 4fc9c86..f3e2edf 100644 (file)
--- a/INFO
+++ b/INFO
@@ -3,7 +3,7 @@ Project Creation Date:
 Project Category:
 Lifecycle State:
 Primary Contact:
-Project Lead: mrunge@redhat.com
+Project Lead: efoley@redhat.com
 Jira Project Name: barometer
 Jira Project Prefix: barometer
 Mailing list tag: []

diff --git a/INFO.yaml b/INFO.yaml
index 1b226dd..9530fb1 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -4,11 +4,11 @@ project_creation_date: ''
 project_category: ''
 lifecycle_state: ''
 project_lead: &opnfv_barometer_ptl
-    name: 'Matthias Runge'
-    email: 'mrunge@redhat.com'
-    id: 'mrunge'
+    name: 'Emma Foley'
+    email: 'efoley@redhat.com'
+    id: 'efoley'
     company: 'redhat.com'
-    timezone: 'Europe/Berlin'
+    timezone: 'Europe/Dublin'
 primary_contact: *opnfv_barometer_ptl
 issue_tracking:
     type: 'jira'
@@ -55,6 +55,10 @@ committers:
       email: 'aasmith@redhat.com'
       company: 'redhat.com'
       id: 'TsaLaGi'
+    - name: 'Matthias Runge'
+      email: 'mrunge@redhat.com'
+      company: 'redhat.com'
+      id: 'mrunge'
 tsc:
     # yamllint disable rule:line-length
     approval: ''

diff --git a/docs/release/userguide/installguide.oneclick.rst b/docs/release/userguide/installguide.oneclick.rst
index c5cb42c..9475e1a 100644 (file)
--- a/docs/release/userguide/installguide.oneclick.rst
+++ b/docs/release/userguide/installguide.oneclick.rst
@@ -283,7 +283,7 @@ To make some changes when a container is running run:
 List of default plugins for collectd container
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 .. note::
-   The dpdk plugins dpdkevents and dpdkstat were tested with DPDK v16.11.
+   The dpdk plugins dpdkevents and dpdkstat were tested with DPDK v18.11.
 
 By default the collectd is started with default configuration which includes the followin plugins:
    * csv, contextswitch, cpu, cpufreq, df, disk, ethstat, ipc, irq, load, memory, numa, processes,

diff --git a/src/package-list.mk b/src/package-list.mk
index d5fedf7..68e2b78 100644 (file)
--- a/src/package-list.mk
+++ b/src/package-list.mk
@@ -6,7 +6,7 @@
 # dpdk section
 # DPDK_URL ?= git://dpdk.org/dpdk
 DPDK_URL ?= http://dpdk.org/git/dpdk
-DPDK_TAG ?= v16.11
+DPDK_TAG ?= v18.11
 
 LIBPQOS_URL ?= https://github.com/01org/intel-cmt-cat.git
 LIBPQOS_TAG ?= master