)]}'
{"manifests/inspector.pp":[{"author":{"_account_id":24245,"name":"Harald Jensås","email":"hjensas@redhat.com","username":"harald.jensas"},"change_message_id":"376cbcb8307612b3d34d33b5faf6ca2a3dd4a894","unresolved":true,"context_lines":[{"line_number":339,"context_line":"    include ironic::inspector::authtoken"},{"line_number":340,"context_line":"  }"},{"line_number":341,"context_line":""},{"line_number":342,"context_line":"  if !is_array($dnsmasq_ip_subnets) {"},{"line_number":343,"context_line":"    fail(\u0027Invalid data type, parameter dnsmasq_ip_subnets must be Array type\u0027)"},{"line_number":344,"context_line":"  }"},{"line_number":345,"context_line":""},{"line_number":346,"context_line":"  if !is_hash($port_physnet_cidr_map) {"},{"line_number":347,"context_line":"    fail(\u0027Invalid data type, parameter port_physnet_cidr_map mush be Hash type\u0027)"},{"line_number":348,"context_line":"  }"},{"line_number":349,"context_line":""},{"line_number":350,"context_line":"  $tftp_root_real    \u003d pick($::ironic::pxe::common::tftp_root, $tftp_root)"},{"line_number":351,"context_line":"  $http_root_real    \u003d pick($::ironic::pxe::common::http_root, $http_root)"}],"source_content_type":"text/x-puppet","patch_set":1,"id":"3efb12a6_6e012b55","side":"PARENT","line":348,"range":{"start_line":342,"start_character":0,"end_line":348,"end_character":3},"updated":"2021-12-02 07:27:21.000000000","message":"Looks like unintentioanal removal of these?","commit_id":"dc1ebc4ff5256454780a079f8e2c5139489221fb"},{"author":{"_account_id":9816,"name":"Takashi Kajinami","email":"kajinamit@oss.nttdata.com","username":"kajinamit"},"change_message_id":"b47cedde6634b80622f709d4d79d4b0b0d0b24e5","unresolved":false,"context_lines":[{"line_number":339,"context_line":"    include ironic::inspector::authtoken"},{"line_number":340,"context_line":"  }"},{"line_number":341,"context_line":""},{"line_number":342,"context_line":"  if !is_array($dnsmasq_ip_subnets) {"},{"line_number":343,"context_line":"    fail(\u0027Invalid data type, parameter dnsmasq_ip_subnets must be Array type\u0027)"},{"line_number":344,"context_line":"  }"},{"line_number":345,"context_line":""},{"line_number":346,"context_line":"  if !is_hash($port_physnet_cidr_map) {"},{"line_number":347,"context_line":"    fail(\u0027Invalid data type, parameter port_physnet_cidr_map mush be Hash type\u0027)"},{"line_number":348,"context_line":"  }"},{"line_number":349,"context_line":""},{"line_number":350,"context_line":"  $tftp_root_real    \u003d pick($::ironic::pxe::common::tftp_root, $tftp_root)"},{"line_number":351,"context_line":"  $http_root_real    \u003d pick($::ironic::pxe::common::http_root, $http_root)"}],"source_content_type":"text/x-puppet","patch_set":1,"id":"042a5f09_bfb1a514","side":"PARENT","line":348,"range":{"start_line":342,"start_character":0,"end_line":348,"end_character":3},"in_reply_to":"3efb12a6_6e012b55","updated":"2021-12-02 07:50:32.000000000","message":"Seems I updated this wrongly while resolving the conflict... Fixed it.","commit_id":"dc1ebc4ff5256454780a079f8e2c5139489221fb"}]}