aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2020-04-06 06:28:11 +0200
committerTibor Frank <tifrank@cisco.com>2020-04-06 04:32:29 +0000
commit1609f84764026eb0d9a7ea12a419c96883bd9ddf (patch)
tree47c82dbd2957ebc3fe67658cba095960fc11e3c6 /resources/tools
parentede8499699740db98f7117eec399cb6c2150ab52 (diff)
Report: Configure report 2001.15
Change-Id: I4926a15e0b89507aad89845e12385ba34adfd68d Signed-off-by: Tibor Frank <tifrank@cisco.com> (cherry picked from commit 8e601d0f37f715ca4ce55dded8bc27cadfe175c2) (cherry picked from commit 68013aca801c8792b16c83efeb50e8056cbf9f4e)
Diffstat (limited to 'resources/tools')
-rw-r--r--resources/tools/presentation/conf.py9
-rwxr-xr-xresources/tools/presentation/run_report.sh9
2 files changed, 18 insertions, 0 deletions
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