From: Vratko Polak <vrpolak@cisco.com>
Date: Thu, 21 May 2020 17:00:51 +0000 (+0200)
Subject: Update TODOs for tox
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=9e00acb523c847179587c1d3eaccab746b00ad22

Update TODOs for tox

Change-Id: I9368557aed7508d9401628c0ddfda475da42bc99
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---

diff --git a/tox.ini b/tox.ini
index a988fd7a1b..b19d07e978 100644
--- a/tox.ini
+++ b/tox.ini
@@ -88,7 +88,8 @@ commands = bash {[tox]checker_dir}/tc_naming.sh
 
 # Keep testenvs sorted alphabetically, please.
 
-# TODO: Migrate current docs check here.
+# TODO: Add a checker against unresolved merge conflicts.
+#       See: https://gerrit.fd.io/r/c/vpp/+/26956
 # TODO: Create voting "pylint violations should not increase" checker.
 # TODO: Create voting checker to reject suites with Force Tags of other suite.
 # TODO: Create voting checker against tags not in tag_documentation.rst file.