)]}'
{"id":"openstack%2Fkolla~704178","triplet_id":"openstack%2Fkolla~master~I73bbfd31586012e1fd64d30f9ce1d7eb2256d210","project":"openstack/kolla","branch":"master","topic":"bug/1860607","hashtags":[],"change_id":"I73bbfd31586012e1fd64d30f9ce1d7eb2256d210","subject":"Add error message when merge fails","status":"MERGED","created":"2020-01-24 17:30:09.000000000","updated":"2020-01-29 09:44:32.000000000","submitted":"2020-01-29 09:42:11.000000000","submitter":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"total_comment_count":0,"unresolved_comment_count":0,"has_review_started":true,"submission_id":"704178-1580290931449-cc57de1a","meta_rev_id":"09ec64e7c8ff203e84e3e9232eaa1628ed44d2c9","_number":704178,"virtual_id_number":704178,"owner":{"_account_id":14985,"name":"Alex Schultz","email":"aschultz@next-development.com","username":"mwhahaha"},"actions":{},"labels":{"Verified":{"approved":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"all":[{"value":0,"_account_id":22629,"name":"Michal Nasiadka","email":"mnasiadka@gmail.com","username":"mnasiadka"},{"value":0,"_account_id":30491,"name":"Radosław Piliszek","display_name":"Radek","email":"radek@piliszek.it","username":"yoctozepto","status":"self-employed techologist, collaborating mostly with 7bulls.com"},{"tag":"autogenerated:zuul:gate","value":2,"date":"2020-01-29 09:42:11.000000000","permitted_voting_range":{"min":2,"max":2},"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},{"value":0,"date":"2020-01-24 17:57:45.000000000","_account_id":23181,"name":"RDO Third Party CI","email":"dmsimard+rdothirdparty@redhat.com","username":"rdothirdparty","tags":["SERVICE_USER"]}],"values":{"-2":"Fails","-1":"Doesn\u0027t seem to work"," 0":"No score","+1":"Works for me","+2":"Verified"},"description":"","default_value":0,"optional":true},"Code-Review":{"approved":{"_account_id":22629,"name":"Michal Nasiadka","email":"mnasiadka@gmail.com","username":"mnasiadka"},"all":[{"value":2,"date":"2020-01-29 08:00:35.000000000","permitted_voting_range":{"min":2,"max":2},"_account_id":22629,"name":"Michal Nasiadka","email":"mnasiadka@gmail.com","username":"mnasiadka"},{"value":2,"date":"2020-01-24 17:33:39.000000000","_account_id":30491,"name":"Radosław Piliszek","display_name":"Radek","email":"radek@piliszek.it","username":"yoctozepto","status":"self-employed techologist, collaborating mostly with 7bulls.com"},{"value":0,"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},{"value":0,"_account_id":23181,"name":"RDO Third Party CI","email":"dmsimard+rdothirdparty@redhat.com","username":"rdothirdparty","tags":["SERVICE_USER"]}],"values":{"-2":"Do not merge","-1":"This patch needs further work before it can be merged"," 0":"No score","+1":"Looks good to me, but someone else must approve","+2":"Looks good to me (core reviewer)"},"description":"","default_value":0,"optional":true},"Workflow":{"approved":{"_account_id":22629,"name":"Michal Nasiadka","email":"mnasiadka@gmail.com","username":"mnasiadka"},"all":[{"value":1,"date":"2020-01-29 08:00:35.000000000","permitted_voting_range":{"min":1,"max":1},"_account_id":22629,"name":"Michal Nasiadka","email":"mnasiadka@gmail.com","username":"mnasiadka"},{"value":0,"_account_id":30491,"name":"Radosław Piliszek","display_name":"Radek","email":"radek@piliszek.it","username":"yoctozepto","status":"self-employed techologist, collaborating mostly with 7bulls.com"},{"value":0,"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},{"value":0,"_account_id":23181,"name":"RDO Third Party CI","email":"dmsimard+rdothirdparty@redhat.com","username":"rdothirdparty","tags":["SERVICE_USER"]}],"values":{"-1":"Work in progress"," 0":"Ready for reviews","+1":"Approved"},"description":"","default_value":0,"optional":true},"Backport-Candidate":{"all":[{"value":0,"_account_id":22629,"name":"Michal Nasiadka","email":"mnasiadka@gmail.com","username":"mnasiadka"},{"value":0,"_account_id":30491,"name":"Radosław Piliszek","display_name":"Radek","email":"radek@piliszek.it","username":"yoctozepto","status":"self-employed techologist, collaborating mostly with 7bulls.com"},{"value":0,"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},{"value":0,"_account_id":23181,"name":"RDO Third Party CI","email":"dmsimard+rdothirdparty@redhat.com","username":"rdothirdparty","tags":["SERVICE_USER"]}],"values":{"-1":"Do Not Backport"," 0":"Backport Review Needed","+1":"Should Backport"},"description":"","default_value":0,"optional":true},"Review-Priority":{"all":[{"value":0,"_account_id":22629,"name":"Michal Nasiadka","email":"mnasiadka@gmail.com","username":"mnasiadka"},{"value":0,"_account_id":30491,"name":"Radosław Piliszek","display_name":"Radek","email":"radek@piliszek.it","username":"yoctozepto","status":"self-employed techologist, collaborating mostly with 7bulls.com"},{"value":0,"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},{"value":0,"_account_id":23181,"name":"RDO Third Party CI","email":"dmsimard+rdothirdparty@redhat.com","username":"rdothirdparty","tags":["SERVICE_USER"]}],"values":{"-1":"Branch Freeze"," 0":"No Priority","+1":"Important Change","+2":"Gate Blocker Fix / Urgent Change"},"description":"","default_value":0,"optional":true}},"removable_reviewers":[],"reviewers":{"REVIEWER":[{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},{"_account_id":22629,"name":"Michal Nasiadka","email":"mnasiadka@gmail.com","username":"mnasiadka"},{"_account_id":23181,"name":"RDO Third Party CI","email":"dmsimard+rdothirdparty@redhat.com","username":"rdothirdparty","tags":["SERVICE_USER"]},{"_account_id":30491,"name":"Radosław Piliszek","display_name":"Radek","email":"radek@piliszek.it","username":"yoctozepto","status":"self-employed techologist, collaborating mostly with 7bulls.com"}]},"pending_reviewers":{},"reviewer_updates":[{"updated":"2020-01-24 17:33:39.000000000","updated_by":{"_account_id":30491,"name":"Radosław Piliszek","display_name":"Radek","email":"radek@piliszek.it","username":"yoctozepto","status":"self-employed techologist, collaborating mostly with 7bulls.com"},"reviewer":{"_account_id":30491,"name":"Radosław Piliszek","display_name":"Radek","email":"radek@piliszek.it","username":"yoctozepto","status":"self-employed techologist, collaborating mostly with 7bulls.com"},"state":"REVIEWER"},{"updated":"2020-01-24 17:57:45.000000000","updated_by":{"_account_id":23181,"name":"RDO Third Party CI","email":"dmsimard+rdothirdparty@redhat.com","username":"rdothirdparty","tags":["SERVICE_USER"]},"reviewer":{"_account_id":23181,"name":"RDO Third Party CI","email":"dmsimard+rdothirdparty@redhat.com","username":"rdothirdparty","tags":["SERVICE_USER"]},"state":"REVIEWER"},{"updated":"2020-01-29 08:00:35.000000000","updated_by":{"_account_id":22629,"name":"Michal Nasiadka","email":"mnasiadka@gmail.com","username":"mnasiadka"},"reviewer":{"_account_id":22629,"name":"Michal Nasiadka","email":"mnasiadka@gmail.com","username":"mnasiadka"},"state":"REVIEWER"},{"updated":"2020-01-29 09:42:11.000000000","updated_by":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"reviewer":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"state":"REVIEWER"}],"messages":[{"id":"3a86bcc2337cd5e6030242612851eab1a564f960","author":{"_account_id":14985,"name":"Alex Schultz","email":"aschultz@next-development.com","username":"mwhahaha"},"date":"2020-01-24 17:30:09.000000000","message":"Uploaded patch set 1.","accounts_in_message":[],"_revision_number":1},{"id":"5bfe34044e8fb32eb40eeb72a05cce8c7e47b951","author":{"_account_id":30491,"name":"Radosław Piliszek","display_name":"Radek","email":"radek@piliszek.it","username":"yoctozepto","status":"self-employed techologist, collaborating mostly with 7bulls.com"},"date":"2020-01-24 17:33:39.000000000","message":"Patch Set 1: Code-Review+2\n\nmakes sense, thanks","accounts_in_message":[],"_revision_number":1},{"id":"060efa2e716985134a02a6b30a1a89303d94c996","author":{"_account_id":23181,"name":"RDO Third Party CI","email":"dmsimard+rdothirdparty@redhat.com","username":"rdothirdparty","tags":["SERVICE_USER"]},"date":"2020-01-24 17:57:45.000000000","message":"Patch Set 1:\n\nBuild succeeded (check pipeline).\n\n- tripleo-build-containers-rhel-8-master https://review.rdoproject.org/zuul/build/5dea635922c048109805f767c22e9d2e : SUCCESS in 25m 47s","accounts_in_message":[],"_revision_number":1},{"id":"3d096f194b31e0d0bc00cfc7c523be50ccf2d74e","tag":"autogenerated:zuul:check-arm64","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2020-01-24 18:48:57.000000000","message":"Patch Set 1:\n\nBuild succeeded (ARM64 pipeline).\n\n- kolla-build-debian-source-aarch64 https://zuul.opendev.org/t/openstack/build/4861d85278564fd388ff55bd6a84cebc : SUCCESS in 1h 14m 09s (non-voting)","accounts_in_message":[],"_revision_number":1},{"id":"05500df9d20219a0a109ad901f0709ffba34d937","tag":"autogenerated:zuul:check","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2020-01-24 19:50:26.000000000","message":"Patch Set 1: Verified+1\n\nBuild succeeded (check pipeline).\n\n- kolla-build-centos-binary https://zuul.opendev.org/t/openstack/build/0a3618b418e04b048eeeb7423eb99a62 : SUCCESS in 32m 54s (non-voting)\n- kolla-build-centos-source https://zuul.opendev.org/t/openstack/build/15cb01db6faa41a591dda8f4bbeec243 : SUCCESS in 45m 41s\n- kolla-build-centos8-binary https://zuul.opendev.org/t/openstack/build/d6b17fea286142b686aa9ce82dc60139 : SUCCESS in 5m 59s (non-voting)\n- kolla-build-centos8-source https://zuul.opendev.org/t/openstack/build/69bafcbfb5c2404e91f1096f6ffa6424 : SUCCESS in 7m 05s\n- kolla-ansible-centos-source https://zuul.opendev.org/t/openstack/build/3fcf8a0b2cc3470c8b97c579253d8d64 : SUCCESS in 1h 25m 24s\n- kolla-ansible-centos-binary https://zuul.opendev.org/t/openstack/build/b31043498800421ebdd8a0877937f4af : SUCCESS in 1h 27m 59s (non-voting)\n- kolla-ansible-centos-source-upgrade https://zuul.opendev.org/t/openstack/build/49747158b2ad4c20aa15e7c97f9d5608 : SUCCESS in 1h 24m 22s\n- tripleo-build-containers-centos-7 https://zuul.opendev.org/t/openstack/build/c1bd710fef514d388eedf3d79a0d7c2c : SUCCESS in 52m 35s\n- kolla-ansible-bifrost-centos-source https://zuul.opendev.org/t/openstack/build/91e61f7082634297b285b1c7c502ec6c : SUCCESS in 1h 02m 31s (non-voting)\n- kolla-ansible-centos-source-ceph https://zuul.opendev.org/t/openstack/build/59fe19e6b1144aaeb118174546aac7f4 : SUCCESS in 2h 07m 02s (non-voting)\n- kolla-ansible-centos-source-upgrade-ceph https://zuul.opendev.org/t/openstack/build/9b0a992fa4464595abf445b9d7978ae5 : SUCCESS in 2h 08m 13s (non-voting)\n- kolla-ansible-centos-source-cinder-lvm https://zuul.opendev.org/t/openstack/build/d32b6b939904492f8c1c130c7e4ffd63 : SUCCESS in 1h 36m 17s (non-voting)\n- kolla-ansible-centos-source-scenario-nfv https://zuul.opendev.org/t/openstack/build/d76e886c92644f38a91566bb89d06a1d : SUCCESS in 1h 53m 35s (non-voting)\n- kolla-ansible-centos-source-ironic https://zuul.opendev.org/t/openstack/build/00cabf01a9384fb89671bc2de7ff22ab : SUCCESS in 1h 28m 38s (non-voting)\n- kolla-build-debian-source https://zuul.opendev.org/t/openstack/build/e3e34525a5aa495b81e7aa4d4b8979d5 : SUCCESS in 27m 55s (non-voting)\n- kolla-build-debian-binary https://zuul.opendev.org/t/openstack/build/57dbe70f244e4ab2b5b0f1f2556eb6b5 : SUCCESS in 25m 46s (non-voting)\n- kolla-ansible-debian-source https://zuul.opendev.org/t/openstack/build/59f470660cbb4ed59432885225fe4450 : SUCCESS in 58m 01s (non-voting)\n- openstack-tox-lower-constraints https://zuul.opendev.org/t/openstack/build/4b9ddf9707e04e12913fc2a2ea516390 : SUCCESS in 5m 36s\n- openstack-tox-pep8 https://zuul.opendev.org/t/openstack/build/cfe8311340374559934e9bee4ff73ac9 : SUCCESS in 6m 18s\n- openstack-tox-py36 https://zuul.opendev.org/t/openstack/build/81c08f79938b4330b1e467e581a76ec8 : SUCCESS in 5m 52s\n- openstack-tox-py37 https://zuul.opendev.org/t/openstack/build/380c6ab177a74fff80d82d11581d5151 : SUCCESS in 6m 56s\n- openstack-tox-py38 https://zuul.opendev.org/t/openstack/build/760841d272b648dc909a5cf9943849af : SUCCESS in 5m 02s (non-voting)\n- openstack-tox-docs https://zuul.opendev.org/t/openstack/build/ef22b8ae5c7246859f5f2342c077a22b : SUCCESS in 6m 40s\n- kolla-build-ubuntu-binary https://zuul.opendev.org/t/openstack/build/38151b242f9947bfb4a0943df2dd5d8a : SUCCESS in 53m 31s (non-voting)\n- kolla-build-ubuntu-source https://zuul.opendev.org/t/openstack/build/ec91205c5fb44bf794cc09ba0124c701 : SUCCESS in 54m 46s\n- kolla-ansible-ubuntu-source https://zuul.opendev.org/t/openstack/build/faaf255d618742c2a859cd9504faf520 : SUCCESS in 57m 24s\n- kolla-ansible-ubuntu-binary https://zuul.opendev.org/t/openstack/build/539736014535457db592f5f2daf41a2d : SUCCESS in 1h 17m 17s (non-voting)\n- kolla-ansible-ubuntu-source-upgrade https://zuul.opendev.org/t/openstack/build/f4291ced06f640f2839cb6098dd65c9f : SUCCESS in 1h 04m 22s\n- kolla-ansible-ubuntu-source-zun https://zuul.opendev.org/t/openstack/build/87c2703b9feb4a3883ccd1415d71f3c5 : SUCCESS in 1h 16m 59s (non-voting)\n- kolla-ansible-ubuntu-source-ceph https://zuul.opendev.org/t/openstack/build/40ee68fb3990406f9f61bbda904573ef : SUCCESS in 1h 20m 23s (non-voting)\n- kolla-ansible-ubuntu-source-upgrade-ceph https://zuul.opendev.org/t/openstack/build/64791653122d4b25a60a037a1a579318 : SUCCESS in 1h 37m 45s (non-voting)\n- kolla-ansible-ubuntu-source-cinder-lvm https://zuul.opendev.org/t/openstack/build/aa2ead35790b44aa8039855c9998a8cf : SUCCESS in 1h 21m 45s (non-voting)\n- kolla-ansible-ubuntu-source-ironic https://zuul.opendev.org/t/openstack/build/0c6427106d1440e0a629f7f0b0054c31 : SUCCESS in 1h 00m 52s (non-voting)","accounts_in_message":[],"_revision_number":1},{"id":"646698f282a5a367f8a6ff87f22bd4393697dff2","author":{"_account_id":22629,"name":"Michal Nasiadka","email":"mnasiadka@gmail.com","username":"mnasiadka"},"date":"2020-01-29 08:00:35.000000000","message":"Patch Set 1: Code-Review+2 Workflow+1","accounts_in_message":[],"_revision_number":1},{"id":"beefb383cf7e39a57cb374f5efac781a8259f750","tag":"autogenerated:zuul:gate","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2020-01-29 08:01:02.000000000","message":"Patch Set 1: -Verified\n\nStarting gate jobs.","accounts_in_message":[],"_revision_number":1},{"id":"383df1e3198f940c064a933dd698bb0fc897dcc6","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2020-01-29 09:42:11.000000000","message":"Change has been successfully merged by Zuul","accounts_in_message":[],"_revision_number":1},{"id":"9aed482780b11b242882476a0450acbe521d26db","tag":"autogenerated:zuul:gate","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2020-01-29 09:42:11.000000000","message":"Patch Set 1: Verified+2\n\nBuild succeeded (gate pipeline).\n\n- kolla-build-centos-source https://zuul.opendev.org/t/openstack/build/4560fff953254c4181227b5bbe950fa4 : SUCCESS in 43m 26s\n- kolla-build-centos8-source https://zuul.opendev.org/t/openstack/build/edef4f18d9134bd48bde657e98b8a581 : SUCCESS in 8m 53s\n- kolla-ansible-centos-source https://zuul.opendev.org/t/openstack/build/44abc13d48b54db4a7f84aee64e80c78 : SUCCESS in 1h 40m 30s\n- kolla-ansible-centos-source-upgrade https://zuul.opendev.org/t/openstack/build/1ff7019311f44aa9965d8c7614287926 : SUCCESS in 1h 33m 09s\n- tripleo-build-containers-centos-7 https://zuul.opendev.org/t/openstack/build/7d48603cd3a04e8387ba2db2a2155b11 : SUCCESS in 53m 28s\n- openstack-tox-lower-constraints https://zuul.opendev.org/t/openstack/build/c74a2ed0cb76409bad9d85cc36552f38 : SUCCESS in 4m 27s\n- openstack-tox-pep8 https://zuul.opendev.org/t/openstack/build/599415be251243eabc108e62fa52866f : SUCCESS in 5m 27s\n- openstack-tox-py36 https://zuul.opendev.org/t/openstack/build/2f0291d5dbdb41b08c26414a2827acaf : SUCCESS in 5m 00s\n- openstack-tox-py37 https://zuul.opendev.org/t/openstack/build/62e862a0c6454e33910b07ef7c2837ac : SUCCESS in 4m 40s\n- openstack-tox-docs https://zuul.opendev.org/t/openstack/build/944d9695fb6048e6985ec133d6379188 : SUCCESS in 6m 50s\n- kolla-build-ubuntu-source https://zuul.opendev.org/t/openstack/build/bd071540ed654c8185ae1dedb08f4cb9 : SUCCESS in 30m 53s\n- kolla-ansible-ubuntu-source https://zuul.opendev.org/t/openstack/build/ecb342ccf2084d6c8fb56d0c8f12632c : SUCCESS in 1h 00m 05s\n- kolla-ansible-ubuntu-source-upgrade https://zuul.opendev.org/t/openstack/build/a78d0d9cbd9e4a7ca893552143db8557 : SUCCESS in 1h 08m 39s","accounts_in_message":[],"_revision_number":1},{"id":"4867b6f9acd05bf3171c48b3cc8606ba0c3f2d42","tag":"autogenerated:zuul:promote","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2020-01-29 09:44:32.000000000","message":"Patch Set 1:\n\nBuild succeeded (promote pipeline).\n\n- promote-openstack-tox-docs https://zuul.opendev.org/t/openstack/build/053bc6fc78c6470f8658aeea934cf854 : SUCCESS in 1m 53s","accounts_in_message":[],"_revision_number":1}],"current_revision_number":1,"current_revision":"2207afc9b9306c19785238f8f02642187f807785","revisions":{"2207afc9b9306c19785238f8f02642187f807785":{"kind":"REWORK","_number":1,"created":"2020-01-24 17:30:09.000000000","uploader":{"_account_id":14985,"name":"Alex Schultz","email":"aschultz@next-development.com","username":"mwhahaha"},"ref":"refs/changes/78/704178/1","fetch":{"anonymous http":{"url":"https://review.opendev.org/openstack/kolla","ref":"refs/changes/78/704178/1","commands":{"Checkout":"git fetch https://review.opendev.org/openstack/kolla refs/changes/78/704178/1 \u0026\u0026 git checkout FETCH_HEAD","Cherry Pick":"git fetch https://review.opendev.org/openstack/kolla refs/changes/78/704178/1 \u0026\u0026 git cherry-pick FETCH_HEAD","Format Patch":"git fetch https://review.opendev.org/openstack/kolla refs/changes/78/704178/1 \u0026\u0026 git format-patch -1 --stdout FETCH_HEAD","Pull":"git pull https://review.opendev.org/openstack/kolla refs/changes/78/704178/1"}}},"commit":{"parents":[{"commit":"db212f92d6f149544d5b2b9c0e88c6b43ff7bcc8","subject":"Merge \"Provision building netcontrold container\"","web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/kolla/commit/db212f92d6f149544d5b2b9c0e88c6b43ff7bcc8"}]}],"author":{"name":"Alex Schultz","email":"aschultz@redhat.com","date":"2020-01-24 17:18:47.000000000","tz":-420},"committer":{"name":"Alex Schultz","email":"aschultz@redhat.com","date":"2020-01-24 17:30:03.000000000","tz":-420},"subject":"Add error message when merge fails","message":"Add error message when merge fails\n\nIf the source cfg directory contains a path (e.g.\n/etc/pki/ca-trust/extracted/) which is also bind mounted into the\ncontainer as read-only, when it attempts to merge the paths together\nthe resulting exception doesn\u0027t really indicate what happened.\n\nChange-Id: I73bbfd31586012e1fd64d30f9ce1d7eb2256d210\nRelated-Bug: #1860607\n","web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/kolla/commit/2207afc9b9306c19785238f8f02642187f807785"}],"resolve_conflicts_web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/kolla/commit/2207afc9b9306c19785238f8f02642187f807785"}]},"branch":"refs/heads/master"}},"requirements":[],"submit_records":[],"submit_requirements":[]}