)]}'
{"magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml":[{"author":{"_account_id":28008,"name":"Guilherme","display_name":"Guilherme Steinmüller","email":"gsteinmuller@vexxhost.com","username":"guilhermesp"},"change_message_id":"ba2f3c5bba1154f0ce62c547be381912becb1c6d","unresolved":true,"context_lines":[{"line_number":1245,"context_line":"            - str_replace:"},{"line_number":1246,"context_line":"                template: {get_file:  ../../common/templates/kubernetes/helm/prometheus-operator.sh}"},{"line_number":1247,"context_line":"                params:"},{"line_number":1248,"context_line":"\u003c\u003c\u003c\u003c\u003c\u003c\u003c HEAD   (f1dd75 Merge \"[fix] Append v3/v1 to auth_url/magnum_url if discover)"},{"line_number":1249,"context_line":"                  \"${ADMIN_PASSWD}\": {get_param: grafana_admin_passwd}"},{"line_number":1250,"context_line":"\u003d\u003d\u003d\u003d\u003d\u003d\u003d"},{"line_number":1251,"context_line":"                  \"${GRAFANA_ADMIN_PASSWD}\": {get_param: grafana_admin_passwd}"}],"source_content_type":"text/x-yaml","patch_set":1,"id":"91c84fcc_3938412e","line":1248,"updated":"2021-02-10 13:57:31.000000000","message":"i think we should resolve the conflicts?","commit_id":"bf1f0c65c139d2a77b12ab22accf0980e1ed2f4c"},{"author":{"_account_id":28008,"name":"Guilherme","display_name":"Guilherme Steinmüller","email":"gsteinmuller@vexxhost.com","username":"guilhermesp"},"change_message_id":"ba2f3c5bba1154f0ce62c547be381912becb1c6d","unresolved":true,"context_lines":[{"line_number":1250,"context_line":"\u003d\u003d\u003d\u003d\u003d\u003d\u003d"},{"line_number":1251,"context_line":"                  \"${GRAFANA_ADMIN_PASSWD}\": {get_param: grafana_admin_passwd}"},{"line_number":1252,"context_line":"                  \"${KUBE_MASTERS_PRIVATE}\": {get_attr: [kube_masters, kube_master_ip]}"},{"line_number":1253,"context_line":"\u003e\u003e\u003e\u003e\u003e\u003e\u003e CHANGE (34f655 Use kube_master_ip for monitoring when no floating ip is use)"},{"line_number":1254,"context_line":"            - get_file: ../../common/templates/kubernetes/helm/prometheus-adapter.sh"},{"line_number":1255,"context_line":"            - get_file: ../../common/templates/kubernetes/helm/ingress-nginx.sh"},{"line_number":1256,"context_line":"            - get_file: ../../common/templates/kubernetes/fragments/install-helm-modules.sh"}],"source_content_type":"text/x-yaml","patch_set":1,"id":"cc69faf0_fdb30c30","line":1253,"updated":"2021-02-10 13:57:31.000000000","message":"i think we should resolve the conflicts?","commit_id":"bf1f0c65c139d2a77b12ab22accf0980e1ed2f4c"}]}