X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=docs%2Freport%2Fintroduction%2Freport_history.rst;h=6e9708f85fe228867ec935c3aacbbfe83ffd3f28;hb=996e23b4deb530e82d6beaa958452f3315f0eb69;hp=8f8abc98cb141358a6ff61c8e0bdedf9ec3ad88c;hpb=24c820de0883b2623471b2a1851492c6fe90e4dd;p=csit.git

diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst
index 8f8abc98cb..6e9708f85f 100644
--- a/docs/report/introduction/report_history.rst
+++ b/docs/report/introduction/report_history.rst
@@ -6,15 +6,137 @@ 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)
+<<<<<<< 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:                                             |
+=======
+=======
+<<<<<<< HEAD   (9b9bbb PAL: Fix table data model)
+>>>>>>> CHANGE (8f2816 Report: Configure report 2001.16)
+| .14            | 1. Added data:                                             |
+<<<<<<< HEAD   (b95753 PAL: Fix table data model)
+>>>>>>> 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)
+=======
+=======
+| .16            | 1. Added data:                                             |
+>>>>>>> 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                          |
 |                |                                                            |
 |                |      - all set selected for analysis and graphs            |
+|                |      - MRR tests                                           |
 |                |                                                            |
+|                |    - VPP performance tests 3n-skx                          |
 |                |                                                            |
+|                |      - 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                          |
+|                |                                                            |
+|                |    - Soak Tests 2n-skx                                     |
 |                |                                                            |
+>>>>>>> CHANGE (b1af33 Report: Add 2n-skx Soak and Reconf tests)
+|                |  2. Added Root Cause Analysis for VPP performance tests    |
+|                |     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)
+<<<<<<< HEAD   (ede849 Report: Add pdf version)
+<<<<<<< HEAD   (35a360 Report: Add data)
+=======
+<<<<<<< HEAD   (ef4187 Report: Add pdf version)
+=======
+=======
+=======
+| .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.                                                   |
++----------------+------------------------------------------------------------+
+| .15            | Skipped.                                                   |
++----------------+------------------------------------------------------------+
+>>>>>>> CHANGE (dfd4a2 Report: Configure Report 2001.18)
+| .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)
+=======
+=======
+<<<<<<< HEAD   (9b9bbb PAL: Fix table data model)
+=======
+| .15            | Skipped.                                                   |
++----------------+------------------------------------------------------------+
+| .14            | Skipped.                                                   |
++----------------+------------------------------------------------------------+
+>>>>>>> CHANGE (42a491 Report: Configure report 2001.16)
+>>>>>>> CHANGE (8f2816 Report: Configure report 2001.16)
+| .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:                                             |