Closed bohde closed 6 years ago
:umbrella: The latest upstream changes (presumably #209) made this pull request unmergeable. Please resolve the merge conflicts.
@reconfig-bot r=CampGareth
:pushpin: Commit 29ec2dc has been approved by CampGareth
:hourglass: Testing commit 29ec2dc with merge 7acdb40...
:broken_heart: Test failed - status-jenkins
@reconfig-bot retry
@reconfig-bot r-
@reconfig-bot r+
:pushpin: Commit 29ec2dc has been approved by joshbohde
:hourglass: Testing commit 29ec2dc with merge 89ec64f...
:broken_heart: Test failed - status-jenkins
"/bin/sh: 1: parse_times: not found" Where's this getting put...
Looks like /bin as a directory is new in this PR so best guess is it's not being copied over
@reconfig-bot r+
:pushpin: Commit 39b06b3 has been approved by CampGareth
:hourglass: Testing commit 39b06b3 with merge b3056a1...
@reconfig-bot r+
:pushpin: Commit ecac940 has been approved by joshbohde
:hourglass: Testing commit ecac940 with merge 920f069...
:broken_heart: Test failed - status-jenkins
@reconfig-bot r+
:pushpin: Commit 48eaaf9 has been approved by joshbohde
:hourglass: Testing commit 48eaaf9 with merge f8fa2e9...
:broken_heart: Test failed - status-jenkins
@reconfig-bot r+
:pushpin: Commit a0bc0ef has been approved by CampGareth
:hourglass: Testing commit a0bc0ef with merge 01b0a66...
:broken_heart: Test failed - status-jenkins
@reconfig-bot r+
:pushpin: Commit 9615241 has been approved by joshbohde
:hourglass: Testing commit 9615241 with merge 5fefbaa...
:broken_heart: Test failed - status-jenkins
@reconfig-bot r+
:pushpin: Commit f19ec95 has been approved by joshbohde
:hourglass: Testing commit f19ec95 with merge 87824b8...
:sunny: Test successful - status-jenkins Approved by: joshbohde Pushing 87824b87ac2f46fb1ad9eec4c217f62cf6f61523 to master...
This was more of a yak shave than I expected, but I wanted to test the fix since it's been broken so long, and that was some effort.
This does the following: