diff options
| -rw-r--r-- | docs/report/introduction/report_history.rst | 19 | ||||
| -rw-r--r-- | resources/tools/presentation/conf.py | 9 | ||||
| -rwxr-xr-x | resources/tools/presentation/run_report.sh | 9 |
3 files changed, 37 insertions, 0 deletions
diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst index 11828810b9..691e468cc4 100644 --- a/docs/report/introduction/report_history.rst +++ b/docs/report/introduction/report_history.rst @@ -6,15 +6,24 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below. +----------------+------------------------------------------------------------+ | .[ww] Revision | Changes | +================+============================================================+ +<<<<<<< HEAD (ede849 Report: Add pdf version) <<<<<<< HEAD (35a360 Report: Add data) +======= +<<<<<<< HEAD (ef4187 Report: Add pdf version) +>>>>>>> CHANGE (68013a Report: Configure report 2001.15) | .13 | 1. Added data: | ======= +<<<<<<< HEAD (ede849 Report: Add pdf version) <<<<<<< HEAD (d4f9e9 CSIT-1597 API cleanup: acl) | .12 | 1. Added data: | ======= | .14 | 1. Added data: | >>>>>>> CHANGE (0ed80e Report: COnfigure reoirt 2001.14) >>>>>>> CHANGE (bdfc93 Report: COnfigure reoirt 2001.14) +======= +| .15 | 1. Added data: | +>>>>>>> CHANGE (8e601d Report: Configure report 2001.15) +>>>>>>> CHANGE (68013a Report: Configure report 2001.15) | | | | | - VPP performance tests 2n-skx | | | | @@ -30,7 +39,17 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below. | | 2n-skx and 3n-skx. | | | | +----------------+------------------------------------------------------------+ +<<<<<<< HEAD (ede849 Report: Add pdf version) <<<<<<< HEAD (35a360 Report: Add data) +======= +<<<<<<< HEAD (ef4187 Report: Add pdf version) +======= +| .14 | Skipped. | ++----------------+------------------------------------------------------------+ +| .13 | Skipped. | ++----------------+------------------------------------------------------------+ +>>>>>>> CHANGE (8e601d Report: Configure report 2001.15) +>>>>>>> CHANGE (68013a Report: Configure report 2001.15) | .12 | Skipped. | +----------------+------------------------------------------------------------+ ======= diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py index 07569dcef5..9c70d97139 100644 --- a/resources/tools/presentation/conf.py +++ b/resources/tools/presentation/conf.py @@ -46,15 +46,24 @@ source_suffix = [u'.rst', u'.md'] master_doc = u'index' # General information about the project. +<<<<<<< HEAD (ede849 Report: Add pdf version) <<<<<<< HEAD (35a360 Report: Add data) +======= +<<<<<<< HEAD (ef4187 Report: Add pdf version) +>>>>>>> CHANGE (68013a Report: Configure report 2001.15) report_week = u'13' ======= +<<<<<<< HEAD (ede849 Report: Add pdf version) <<<<<<< HEAD (d4f9e9 CSIT-1597 API cleanup: acl) report_week = u'12' ======= report_week = u'14' >>>>>>> CHANGE (0ed80e Report: COnfigure reoirt 2001.14) >>>>>>> CHANGE (bdfc93 Report: COnfigure reoirt 2001.14) +======= +report_week = u'15' +>>>>>>> CHANGE (8e601d Report: Configure report 2001.15) +>>>>>>> CHANGE (68013a Report: Configure report 2001.15) 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 f661c99c7a..5c4dcfd6e2 100755 --- a/resources/tools/presentation/run_report.sh +++ b/resources/tools/presentation/run_report.sh @@ -38,15 +38,24 @@ export PYTHONPATH=`pwd`:`pwd`/../../../:`pwd`/../../libraries/python python pal.py \ --specification specification.yaml \ --release ${RELEASE} \ +<<<<<<< HEAD (ede849 Report: Add pdf version) <<<<<<< HEAD (35a360 Report: Add data) +======= +<<<<<<< HEAD (ef4187 Report: Add pdf version) +>>>>>>> CHANGE (68013a Report: Configure report 2001.15) --week "13" \ ======= +<<<<<<< HEAD (ede849 Report: Add pdf version) <<<<<<< HEAD (d4f9e9 CSIT-1597 API cleanup: acl) --week "12" \ ======= --week "14" \ >>>>>>> CHANGE (0ed80e Report: COnfigure reoirt 2001.14) >>>>>>> CHANGE (bdfc93 Report: COnfigure reoirt 2001.14) +======= + --week "15" \ +>>>>>>> CHANGE (8e601d Report: Configure report 2001.15) +>>>>>>> CHANGE (68013a Report: Configure report 2001.15) --logging INFO \ --force |