Blame SOURCES/0007-Issue-50538-Fix-cherry-pick-error.patch

4c04d8
From 5fee4d79db94684d8093501fde3422ad34ac2716 Mon Sep 17 00:00:00 2001
e79480
From: Mark Reynolds <mreynolds@redhat.com>
4c04d8
Date: Tue, 3 Sep 2019 13:40:27 -0400
4c04d8
Subject: [PATCH] Issue 50538 - Fix cherry-pick error
e79480
4c04d8
Description:  Remove cherry-=pick error formating
4c04d8
4c04d8
relates: https://pagure.io/389-ds-base/issue/50538
e79480
---
e79480
 dirsrvtests/tests/suites/replication/cleanallruv_test.py | 1 -
e79480
 1 file changed, 1 deletion(-)
e79480
e79480
diff --git a/dirsrvtests/tests/suites/replication/cleanallruv_test.py b/dirsrvtests/tests/suites/replication/cleanallruv_test.py
e79480
index 43801dd52..caf214b19 100644
e79480
--- a/dirsrvtests/tests/suites/replication/cleanallruv_test.py
e79480
+++ b/dirsrvtests/tests/suites/replication/cleanallruv_test.py
e79480
@@ -899,7 +899,6 @@ def test_max_tasks(topology_m4):
e79480
 
e79480
     # Check the errors log for our error message in master 1
e79480
     assert m1.searchErrorsLog('Exceeded maximum number of active CLEANALLRUV tasks')
e79480
->>>>>>> ab24aa4cb... Issue 50538 - cleanAllRUV task limit is not enforced for replicated tasks
e79480
 
e79480
 
e79480
 if __name__ == '__main__':
e79480
-- 
e79480
2.21.0
e79480