)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":7730,"name":"Sahid Orentino Ferdjaoui","email":"sahid.ferdjaoui@industrialdiscipline.com","username":"sahid"},"change_message_id":"9f52e7c811a26f576da191c1eedf1fefb828f47a","unresolved":false,"context_lines":[{"line_number":16,"context_line":""},{"line_number":17,"context_line":"Change-Id: I8721b680bbd9f59a67bd8e6855ffb291c208cdb8"},{"line_number":18,"context_line":"Closes-Bug: #1825888"},{"line_number":19,"context_line":"(cherry picked from commit 9ad9b8483913a38345133120b04c4677fab9cb68)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":4,"id":"bfb3d3c7_828a9918","line":19,"range":{"start_line":19,"start_character":0,"end_line":19,"end_character":68},"updated":"2019-05-22 15:21:17.000000000","message":"I think you should have cherry-picked that one from c42e7641f00905ff2dd68096d733929bf84756b5 when merged, right?","commit_id":"3d5744d6e127c1fee172349b91483fc0ddadc46f"},{"author":{"_account_id":12898,"name":"Tony Breeds","email":"tony@bakeyournoodle.com","username":"tonyb"},"change_message_id":"cabac96ec52c4c124577347160c3829fc5a5bd76","unresolved":false,"context_lines":[{"line_number":16,"context_line":""},{"line_number":17,"context_line":"Change-Id: I8721b680bbd9f59a67bd8e6855ffb291c208cdb8"},{"line_number":18,"context_line":"Closes-Bug: #1825888"},{"line_number":19,"context_line":"(cherry picked from commit 9ad9b8483913a38345133120b04c4677fab9cb68)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":4,"id":"bfb3d3c7_68b4dfd1","line":19,"range":{"start_line":19,"start_character":0,"end_line":19,"end_character":68},"in_reply_to":"bfb3d3c7_3d5c2e7d","updated":"2019-05-27 23:55:21.000000000","message":"Thanks that\u0027d be good.  For future reference it\u0027s good to do from the beginning as (my) tools look for that and can behave smarter if it\u0027s there.","commit_id":"3d5744d6e127c1fee172349b91483fc0ddadc46f"},{"author":{"_account_id":16688,"name":"Rodolfo Alonso","email":"ralonsoh@redhat.com","username":"rodolfo-alonso-hernandez"},"change_message_id":"127917c7bb007de250e6a86d086ae9824dea6040","unresolved":false,"context_lines":[{"line_number":16,"context_line":""},{"line_number":17,"context_line":"Change-Id: I8721b680bbd9f59a67bd8e6855ffb291c208cdb8"},{"line_number":18,"context_line":"Closes-Bug: #1825888"},{"line_number":19,"context_line":"(cherry picked from commit 9ad9b8483913a38345133120b04c4677fab9cb68)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":4,"id":"bfb3d3c7_dbd110fd","line":19,"range":{"start_line":19,"start_character":0,"end_line":19,"end_character":68},"in_reply_to":"bfb3d3c7_68b4dfd1","updated":"2019-05-28 08:21:51.000000000","message":"Done","commit_id":"3d5744d6e127c1fee172349b91483fc0ddadc46f"},{"author":{"_account_id":16688,"name":"Rodolfo Alonso","email":"ralonsoh@redhat.com","username":"rodolfo-alonso-hernandez"},"change_message_id":"e7c71a7a4b180bf92d6a0c3efe10470da066b27d","unresolved":false,"context_lines":[{"line_number":16,"context_line":""},{"line_number":17,"context_line":"Change-Id: I8721b680bbd9f59a67bd8e6855ffb291c208cdb8"},{"line_number":18,"context_line":"Closes-Bug: #1825888"},{"line_number":19,"context_line":"(cherry picked from commit 9ad9b8483913a38345133120b04c4677fab9cb68)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":4,"id":"bfb3d3c7_3d5c2e7d","line":19,"range":{"start_line":19,"start_character":0,"end_line":19,"end_character":68},"in_reply_to":"bfb3d3c7_828a9918","updated":"2019-05-22 16:02:54.000000000","message":"Correct. I\u0027ll add this info once the parent patch is merged.","commit_id":"3d5744d6e127c1fee172349b91483fc0ddadc46f"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"63770ad8bebb60ca6c9354e1459bc035e9b34786","unresolved":false,"context_lines":[{"line_number":12,"context_line":"- Always use the best local address."},{"line_number":13,"context_line":""},{"line_number":14,"context_line":"Conflicts:"},{"line_number":15,"context_line":"      vif_plug_linux_bridge/linux_net.py"},{"line_number":16,"context_line":"      vif_plug_linux_bridge/tests/unit/test_linux_net.py"},{"line_number":17,"context_line":"      vif_plug_ovs/linux_net.py"},{"line_number":18,"context_line":"      vif_plug_ovs/tests/unit/test_linux_net.py"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":5,"id":"bfb3d3c7_ac988074","line":15,"updated":"2019-05-29 21:22:41.000000000","message":"Looks like the main conflict is due to Id03be72e22302a0954f3e47c116f389cb4304c03.","commit_id":"ca9963c2944ebfd93757471f99e9185bf34f61d4"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"63770ad8bebb60ca6c9354e1459bc035e9b34786","unresolved":false,"context_lines":[{"line_number":14,"context_line":"Conflicts:"},{"line_number":15,"context_line":"      vif_plug_linux_bridge/linux_net.py"},{"line_number":16,"context_line":"      vif_plug_linux_bridge/tests/unit/test_linux_net.py"},{"line_number":17,"context_line":"      vif_plug_ovs/linux_net.py"},{"line_number":18,"context_line":"      vif_plug_ovs/tests/unit/test_linux_net.py"},{"line_number":19,"context_line":""},{"line_number":20,"context_line":"[1]http://kb.linuxvirtualserver.org/wiki/Using_arp_announce/arp_ignore_to_disable_ARP"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":5,"id":"bfb3d3c7_4c92244e","line":17,"updated":"2019-05-29 21:22:41.000000000","message":"And the conflict here looks like I8308e8840e20b0a72d00880c1a7996b4c73f6a83.","commit_id":"ca9963c2944ebfd93757471f99e9185bf34f61d4"}]}