)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":10343,"name":"Jim Rollenhagen","email":"jim@jimrollenhagen.com","username":"jimrollenhagen"},"change_message_id":"68d46bdfc5918443750a135c6071c85a1729dc29","unresolved":false,"context_lines":[{"line_number":14,"context_line":"This is being done to fix the stable branch builds."},{"line_number":15,"context_line":""},{"line_number":16,"context_line":"Change-Id: I7251dc7deac788716adad7b596f25fd1633cf289"},{"line_number":17,"context_line":"(cherry picked from commit 3cb22eef0b86baed98c9f00d35a328d0212d14a1)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"5f7c97a3_b3e1afd2","line":17,"updated":"2018-06-01 12:04:02.000000000","message":"Cherry-picked from itself? O_o","commit_id":"3c099452ebef2353acaacaa3e4f8adbeb48bbcde"}],"Dockerfile":[{"author":{"_account_id":10343,"name":"Jim Rollenhagen","email":"jim@jimrollenhagen.com","username":"jimrollenhagen"},"change_message_id":"87c37633396c870b3665b077c70acfcee70ff095","unresolved":false,"context_lines":[{"line_number":25,"context_line":"    proxy.sh apt-get -y upgrade \u0026\u0026 \\"},{"line_number":26,"context_line":"    proxy.sh apt-get install -y --no-install-recommends gdisk python2.7 python2.7-dev \\"},{"line_number":27,"context_line":"        python-pip qemu-utils parted hdparm util-linux genisoimage git gcc \\"},{"line_number":28,"context_line":"        bash coreutils tgt dmidecode ipmitool psmisc dosfstools bsdmainutils \u0026\u0026 \\"},{"line_number":29,"context_line":"    proxy.sh apt-get --only-upgrade -t jessie-backports install -y qemu-utils"},{"line_number":30,"context_line":""},{"line_number":31,"context_line":"# Some cleanup"}],"source_content_type":"text/x-dockerfile","patch_set":2,"id":"5f7c97a3_33f6ff90","side":"PARENT","line":28,"updated":"2018-06-01 12:07:35.000000000","message":"Er, why are we dropping bsdmainutils here? Copy/paste error?","commit_id":"d8a12531bfb4e5b51843819f95f76a656d5ba9b0"},{"author":{"_account_id":11655,"name":"Julia Kreger","email":"juliaashleykreger@gmail.com","username":"jkreger","status":"Flying to the moon with a Jetpack!"},"change_message_id":"fd908f1b76f039b625a652ef8b9d227fb24b2259","unresolved":false,"context_lines":[{"line_number":25,"context_line":"    proxy.sh apt-get -y upgrade \u0026\u0026 \\"},{"line_number":26,"context_line":"    proxy.sh apt-get install -y --no-install-recommends gdisk python2.7 python2.7-dev \\"},{"line_number":27,"context_line":"        python-pip qemu-utils parted hdparm util-linux genisoimage git gcc \\"},{"line_number":28,"context_line":"        bash coreutils tgt dmidecode ipmitool psmisc dosfstools bsdmainutils \u0026\u0026 \\"},{"line_number":29,"context_line":"    proxy.sh apt-get --only-upgrade -t jessie-backports install -y qemu-utils"},{"line_number":30,"context_line":""},{"line_number":31,"context_line":"# Some cleanup"}],"source_content_type":"text/x-dockerfile","patch_set":2,"id":"5f7c97a3_53385bec","side":"PARENT","line":28,"in_reply_to":"5f7c97a3_33f6ff90","updated":"2018-06-01 12:25:01.000000000","message":"Merge conflict I believe that didn\u0027t make sense, I was just grabbing what I knew should work in a rush. :(","commit_id":"d8a12531bfb4e5b51843819f95f76a656d5ba9b0"}]}
