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