aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2020-03-30 07:44:17 +0200
committerTibor Frank <tifrank@cisco.com>2020-03-30 05:45:58 +0000
commit9a5e9b745df25cff0a23141cbccff83b6a55d2e9 (patch)
treec5dae8ba42e6717423960b5fd527076189ad75e9 /docs
parent35a3602cb35bf73d5697cebd5509a26dcda73268 (diff)
Report: COnfigure reoirt 2001.14
Change-Id: Ic899dbe5875238c36e83778c413c7943169ef8df Signed-off-by: Tibor Frank <tifrank@cisco.com> (cherry picked from commit 0ed80e392d1ab253af67ab7a46d29804bfe84360) (cherry picked from commit bdfc93b44c6f134a0a82a50cf11aad10cbee33f9)
Diffstat (limited to 'docs')
-rw-r--r--docs/report/introduction/report_history.rst18
1 files changed, 18 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: |