{"action":"created","issue":{"url":"https://api.github.com/repos/saltstack/salt/issues/50973","repository_url":"https://api.github.com/repos/saltstack/salt","labels_url":"https://api.github.com/repos/saltstack/salt/issues/50973/labels{/name}","comments_url":"https://api.github.com/repos/saltstack/salt/issues/50973/comments","events_url":"https://api.github.com/repos/saltstack/salt/issues/50973/events","html_url":"https://github.com/saltstack/salt/pull/50973","id":393781148,"node_id":"MDExOlB1bGxSZXF1ZXN0MjQwNzAxMTg5","number":50973,"title":"[develop] Merge forward from fluorine to develop","user":{"login":"garethgreenaway","id":718525,"node_id":"MDQ6VXNlcjcxODUyNQ==","avatar_url":"https://avatars0.githubusercontent.com/u/718525?v=4","gravatar_id":"","url":"https://api.github.com/users/garethgreenaway","html_url":"https://github.com/garethgreenaway","followers_url":"https://api.github.com/users/garethgreenaway/followers","following_url":"https://api.github.com/users/garethgreenaway/following{/other_user}","gists_url":"https://api.github.com/users/garethgreenaway/gists{/gist_id}","starred_url":"https://api.github.com/users/garethgreenaway/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/garethgreenaway/subscriptions","organizations_url":"https://api.github.com/users/garethgreenaway/orgs","repos_url":"https://api.github.com/users/garethgreenaway/repos","events_url":"https://api.github.com/users/garethgreenaway/events{/privacy}","received_events_url":"https://api.github.com/users/garethgreenaway/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2018-12-23T21:18:11Z","updated_at":"2018-12-25T00:20:07Z","closed_at":null,"author_association":"MEMBER","pull_request":{"url":"https://api.github.com/repos/saltstack/salt/pulls/50973","html_url":"https://github.com/saltstack/salt/pull/50973","diff_url":"https://github.com/saltstack/salt/pull/50973.diff","patch_url":"https://github.com/saltstack/salt/pull/50973.patch"},"body":"Merge branch 'fluorine' into develop\r\n\r\nConflicts:\r\n\r\n  - salt/modules/win_lgpo.py\r\n  - salt/templates/debian_ip/debian_eth.jinja\r\n  - tests/unit/modules/test_debian_ip.py\r\n\r\n@MTecknology There was a conflict in the debian_eth.jinja template due to a change against develop back in August that has since been backported to 2018.3 & Fluorine, that didn't merge forward correctly when merged forward from fluorine. Would you mind double checking the version of the template that is currently in develop and make sure it has the right changes from #49355. Thanks!"},"comment":{"url":"https://api.github.com/repos/saltstack/salt/issues/comments/449780172","html_url":"https://github.com/saltstack/salt/pull/50973#issuecomment-449780172","issue_url":"https://api.github.com/repos/saltstack/salt/issues/50973","id":449780172,"node_id":"MDEyOklzc3VlQ29tbWVudDQ0OTc4MDE3Mg==","user":{"login":"MTecknology","id":1413430,"node_id":"MDQ6VXNlcjE0MTM0MzA=","avatar_url":"https://avatars0.githubusercontent.com/u/1413430?v=4","gravatar_id":"","url":"https://api.github.com/users/MTecknology","html_url":"https://github.com/MTecknology","followers_url":"https://api.github.com/users/MTecknology/followers","following_url":"https://api.github.com/users/MTecknology/following{/other_user}","gists_url":"https://api.github.com/users/MTecknology/gists{/gist_id}","starred_url":"https://api.github.com/users/MTecknology/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MTecknology/subscriptions","organizations_url":"https://api.github.com/users/MTecknology/orgs","repos_url":"https://api.github.com/users/MTecknology/repos","events_url":"https://api.github.com/users/MTecknology/events{/privacy}","received_events_url":"https://api.github.com/users/MTecknology/received_events","type":"User","site_admin":false},"created_at":"2018-12-25T00:20:07Z","updated_at":"2018-12-25T00:20:07Z","author_association":"CONTRIBUTOR","body":"At a glance, it looks like @Ch3LL is right and there was a legitimate test\nfailure, but it could be because I wrote two sets of tests and one was much\nbetter than the other.\n\nDigging into this sounds like an unpleasant challenge... partly because it\nseems like there's a whole lot of movement in a few directions and this\nkinda thing is unfamiliar territory.\n\nYou mentioned the Debian template, but I don't see that file listed in the\nmerge. Is that because of the conflicts?\n\nTo reproduce this issue, should I be able to clone your branch and attempt\na simple merge from develop?\n\n>\n"}}
{"actor":{"display_login":"MTecknology"}}