Report: Configure report 2001.15

[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 2f60877..691e468 100644 (file)
--- a/docs/report/introduction/report_history.rst
+++ b/docs/report/introduction/report_history.rst
@@ -6,6 +6,61 @@ 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                          |
+|                |                                                            |
+|                |      - all set selected for analysis and graphs            |
+|                |      - MRR tests                                           |
+|                |                                                            |
+|                |    - VPP performance tests 3n-skx                          |
+|                |                                                            |
+|                |      - all set selected for analysis and graphs            |
+|                |      - MRR tests                                           |
+|                |                                                            |
+|                |  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)
+=======
+| .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)
+=======
+| .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:                                             |