aboutsummaryrefslogtreecommitdiffstats
path: root/docs
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 /docs
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 'docs')
-rw-r--r--docs/report/introduction/report_history.rst19
1 files changed, 19 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. |
+----------------+------------------------------------------------------------+
=======