diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/report/introduction/report_history.rst | 18 |
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: | |