aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2020-05-07 10:19:56 +0200
committerTibor Frank <tifrank@cisco.com>2020-05-11 04:32:50 +0000
commit996e23b4deb530e82d6beaa958452f3315f0eb69 (patch)
treead5c998702c5e61bb7f7b4c16e464039be2aa045 /docs
parentc842ea4ccfbdc92026ddcf5a4c8980d5a0bfb506 (diff)
Report: Configure report 2001.20
Change-Id: Ib0a3190dfd5b216aa9ff93d751fa48cd42cef88f Signed-off-by: Tibor Frank <tifrank@cisco.com> (cherry picked from commit f4c4608a348dbff603a75fb59e36e1ee8daa2b2a) (cherry picked from commit 6df8919916d3a50c686822f097dd0ed83cce7884)
Diffstat (limited to 'docs')
-rw-r--r--docs/report/introduction/report_history.rst25
1 files changed, 25 insertions, 0 deletions
diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst
index 44164cf34c..6e9708f85f 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 (c842ea Report: Add data)
<<<<<<< HEAD (953d13 Report: Fix typo in specification.)
<<<<<<< HEAD (793b6b Report: Add data)
<<<<<<< HEAD (b95753 PAL: Fix table data model)
@@ -37,11 +38,20 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below.
>>>>>>> CHANGE (42a491 Report: Configure report 2001.16)
>>>>>>> CHANGE (8f2816 Report: Configure report 2001.16)
=======
+=======
+<<<<<<< HEAD (d5fe67 Report: Add data)
+>>>>>>> CHANGE (6df891 Report: Configure report 2001.20)
| .18 | 1. Added data: |
+<<<<<<< HEAD (c842ea Report: Add data)
>>>>>>> CHANGE (dfd4a2 Report: Configure Report 2001.18)
=======
| .19 | 1. Added data: |
>>>>>>> CHANGE (413f1d Report: Configure report 2001.19)
+=======
+=======
+| .20 | 1. Added data: |
+>>>>>>> CHANGE (f4c460 Report: Configure report 2001.20)
+>>>>>>> CHANGE (6df891 Report: Configure report 2001.20)
| | |
| | - VPP performance tests 2n-skx |
| | |
@@ -53,8 +63,13 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below.
| | - all set selected for analysis and graphs |
| | - MRR tests |
| | |
+<<<<<<< HEAD (c842ea Report: Add data)
<<<<<<< HEAD (bd7b2e Report: Comparison tables)
=======
+=======
+| | - test sets: crypto, L2, IPv6, memif |
+| | |
+>>>>>>> CHANGE (6df891 Report: Configure report 2001.20)
| | - Hoststack 3n-hsw tests |
| | |
| | - Reconfiguration Tests 2n-skx |
@@ -66,6 +81,7 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below.
| | 2n-skx and 3n-skx. |
| | |
+----------------+------------------------------------------------------------+
+<<<<<<< HEAD (c842ea Report: Add data)
<<<<<<< HEAD (953d13 Report: Fix typo in specification.)
<<<<<<< HEAD (793b6b Report: Add data)
<<<<<<< HEAD (b95753 PAL: Fix table data model)
@@ -79,6 +95,15 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below.
| .18 | Skipped. |
+----------------+------------------------------------------------------------+
>>>>>>> CHANGE (413f1d Report: Configure report 2001.19)
+=======
+<<<<<<< HEAD (d5fe67 Report: Add data)
+=======
+| .19 | Skipped. |
++----------------+------------------------------------------------------------+
+| .18 | Skipped. |
++----------------+------------------------------------------------------------+
+>>>>>>> CHANGE (f4c460 Report: Configure report 2001.20)
+>>>>>>> CHANGE (6df891 Report: Configure report 2001.20)
| .17 | Skipped. |
+----------------+------------------------------------------------------------+
| .16 | Skipped. |