From 22d06f9bcf950df549ecec15428c7ef8eed13c2f Mon Sep 17 00:00:00 2001 From: Solio Sarabia Date: Fri, 17 Mar 2017 21:24:56 -0500 Subject: [PATCH] Ignore copy of manager.py into ironic Ignore changes in copying manager.py from openstack/tempest, and changes in pruning this file to what ironic needs. Change-Id: Ic65fb6d8bba5d5ee209983152645612fe1fa2224 --- etc/corrections.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/etc/corrections.json b/etc/corrections.json index 8f26f4ab1..10da1d232 100644 --- a/etc/corrections.json +++ b/etc/corrections.json @@ -3306,6 +3306,22 @@ "user_name": "Yujun Zhang", "company_name": "ZTE Corporation", "correction_comment": "Related-Bug: #1634020" + }, + { + "correction_comment": "Ignore copy manager.py", + "loc": 13, + "change_id": ["Iaa06df6ab75fb8f79cbcd3f6b21e68622e7799c1"], + "primary_key": "881e5ad9dbfdea881d20de22fd8ce0c4ad1552bc", + "module": "ironic", + "subject": "Include copy of tempest.scenario.manager" + }, + { + "correction_comment": "Ignore pruning of manager.py", + "loc": 0, + "change_id": ["I3ca7cf3af42e0e55431d5affa36e567f147aa850"], + "primary_key": "352aacfd45e66a57dc1461b85ed9c3e85f3935a2", + "module": "ironic", + "subject": "Prune local copy of tempest.scenario.manager.py" } ], "user_corrections": [