diff options
| -rw-r--r-- | docs/report/introduction/report_history.rst | 13 | ||||
| -rw-r--r-- | resources/tools/presentation/conf.py | 4 | ||||
| -rwxr-xr-x | resources/tools/presentation/run_report.sh | 4 |
3 files changed, 21 insertions, 0 deletions
diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst index 6a35df4e46..e96892bbf3 100644 --- a/docs/report/introduction/report_history.rst +++ b/docs/report/introduction/report_history.rst @@ -6,6 +6,7 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below. +----------------+------------------------------------------------------------+ | .[ww] Revision | Changes | +================+============================================================+ +<<<<<<< HEAD (793b6b Report: Add data) <<<<<<< HEAD (b95753 PAL: Fix table data model) <<<<<<< HEAD (ede849 Report: Add pdf version) <<<<<<< HEAD (35a360 Report: Add data) @@ -34,6 +35,9 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below. | .16 | 1. Added data: | >>>>>>> CHANGE (42a491 Report: Configure report 2001.16) >>>>>>> CHANGE (8f2816 Report: Configure report 2001.16) +======= +| .18 | 1. Added data: | +>>>>>>> CHANGE (dfd4a2 Report: Configure Report 2001.18) | | | | | - VPP performance tests 2n-skx | | | | @@ -58,12 +62,21 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below. | | 2n-skx and 3n-skx. | | | | +----------------+------------------------------------------------------------+ +<<<<<<< HEAD (793b6b Report: Add data) <<<<<<< HEAD (b95753 PAL: Fix table data model) <<<<<<< HEAD (ede849 Report: Add pdf version) <<<<<<< HEAD (35a360 Report: Add data) ======= <<<<<<< HEAD (ef4187 Report: Add pdf version) ======= +======= +| .17 | Skipped. | ++----------------+------------------------------------------------------------+ +| .16 | Skipped. | ++----------------+------------------------------------------------------------+ +| .15 | Skipped. | ++----------------+------------------------------------------------------------+ +>>>>>>> CHANGE (dfd4a2 Report: Configure Report 2001.18) | .14 | Skipped. | +----------------+------------------------------------------------------------+ | .13 | Skipped. | diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py index c711b73641..26431469b6 100644 --- a/resources/tools/presentation/conf.py +++ b/resources/tools/presentation/conf.py @@ -46,6 +46,7 @@ source_suffix = [u'.rst', u'.md'] master_doc = u'index' # General information about the project. +<<<<<<< HEAD (793b6b Report: Add data) <<<<<<< HEAD (b95753 PAL: Fix table data model) <<<<<<< HEAD (ede849 Report: Add pdf version) <<<<<<< HEAD (35a360 Report: Add data) @@ -74,6 +75,9 @@ report_week = u'15' report_week = u'16' >>>>>>> CHANGE (42a491 Report: Configure report 2001.16) >>>>>>> CHANGE (8f2816 Report: Configure report 2001.16) +======= +report_week = u'18' +>>>>>>> CHANGE (dfd4a2 Report: Configure Report 2001.18) project = u'FD.io CSIT-2001.{week}'.format(week=report_week) copyright = u'2020, FD.io' author = u'FD.io CSIT' diff --git a/resources/tools/presentation/run_report.sh b/resources/tools/presentation/run_report.sh index 165c3fc4f8..3dcd1ada7c 100755 --- a/resources/tools/presentation/run_report.sh +++ b/resources/tools/presentation/run_report.sh @@ -38,6 +38,7 @@ export PYTHONPATH=`pwd`:`pwd`/../../../:`pwd`/../../libraries/python python pal.py \ --specification specification.yaml \ --release ${RELEASE} \ +<<<<<<< HEAD (793b6b Report: Add data) <<<<<<< HEAD (b95753 PAL: Fix table data model) <<<<<<< HEAD (ede849 Report: Add pdf version) <<<<<<< HEAD (35a360 Report: Add data) @@ -66,6 +67,9 @@ python pal.py \ --week "16" \ >>>>>>> CHANGE (42a491 Report: Configure report 2001.16) >>>>>>> CHANGE (8f2816 Report: Configure report 2001.16) +======= + --week "18" \ +>>>>>>> CHANGE (dfd4a2 Report: Configure Report 2001.18) --logging INFO \ --force |