Revert "Report: Configure report 2001.20"

[csit.git] / docs / report / introduction / report_history.rst

diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst
index 691e468..4109242 100644 (file)
--- a/docs/report/introduction/report_history.rst
+++ b/docs/report/introduction/report_history.rst
@@ -6,24 +6,7 @@ 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)
+| .20            | 1. Added data:                                             |
 |                |                                                            |
 |                |    - VPP performance tests 2n-skx                          |
 |                |                                                            |
@@ -35,32 +18,40 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below.
 |                |      - all set selected for analysis and graphs            |
 |                |      - MRR tests                                           |
 |                |                                                            |
+|                |    - Hoststack 3n-hsw tests                                |
+|                |                                                            |
+|                |    - Reconfiguration Tests 2n-skx                          |
+|                |                                                            |
+|                |    - Soak Tests 2n-skx                                     |
+|                |                                                            |
 |                |  2. Added Root Cause Analysis for VPP performance tests    |
 |                |     2n-skx and 3n-skx.                                     |
 |                |                                                            |
 +----------------+------------------------------------------------------------+
-<<<<<<< HEAD   (ede849 Report: Add pdf version)
-<<<<<<< HEAD   (35a360 Report: Add data)
-=======
-<<<<<<< HEAD   (ef4187 Report: Add pdf version)
-=======
+| .19            | Skipped.                                                   |
++----------------+------------------------------------------------------------+
+| .18            | Skipped.                                                   |
++----------------+------------------------------------------------------------+
+| .17            | Skipped.                                                   |
++----------------+------------------------------------------------------------+
+| .16            | Skipped.                                                   |
++----------------+------------------------------------------------------------+
+| .15            | Skipped.                                                   |
++----------------+------------------------------------------------------------+
 | .14            | Skipped.                                                   |
 +----------------+------------------------------------------------------------+
 | .13            | Skipped.                                                   |
 +----------------+------------------------------------------------------------+
->>>>>>> CHANGE (8e601d Report: Configure report 2001.15)
->>>>>>> CHANGE (68013a Report: Configure report 2001.15)
 | .12            | Skipped.                                                   |
 +----------------+------------------------------------------------------------+
-=======
-<<<<<<< HEAD   (d4f9e9 CSIT-1597 API cleanup: acl)
-=======
+| .15            | Skipped.                                                   |
++----------------+------------------------------------------------------------+
+| .14            | Skipped.                                                   |
++----------------+------------------------------------------------------------+
 | .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:                                             |