[389-commits] [389-ds-base] branch 389-ds-base-1.3.10 updated: Issue 50538 - Fix cherry-pick error
This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch 389-ds-base-1.3.10
in repository 389-ds-base.
The following commit(s) were added to refs/heads/389-ds-base-1.3.10 by this push:
new e185f7c Issue 50538 - Fix cherry-pick error
e185f7c is described below
commit e185f7c61e9737c7a995cc0efc5a7729e275d2ed
Author: Mark Reynolds <mreynolds(a)redhat.com>
AuthorDate: Tue Sep 3 13:40:27 2019 -0400
Issue 50538 - Fix cherry-pick error
Description: Remove cherry-=pick error formating
relates: https://pagure.io/389-ds-base/issue/50538
---
dirsrvtests/tests/suites/replication/cleanallruv_test.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/dirsrvtests/tests/suites/replication/cleanallruv_test.py
b/dirsrvtests/tests/suites/replication/cleanallruv_test.py
index 43801dd..caf214b 100644
--- a/dirsrvtests/tests/suites/replication/cleanallruv_test.py
+++ b/dirsrvtests/tests/suites/replication/cleanallruv_test.py
@@ -899,7 +899,6 @@ def test_max_tasks(topology_m4):
# Check the errors log for our error message in master 1
assert m1.searchErrorsLog('Exceeded maximum number of active CLEANALLRUV
tasks')
->>>>>>> ab24aa4cb... Issue 50538 - cleanAllRUV task limit is not
enforced for replicated tasks
if __name__ == '__main__':
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.