This merges from the same upstream commit that @brendandahl merged into https://github.com/mozilla/spidernode. The git-cinnabar commit ID is 199d8cb0035ba10a2fcd6afe2bdc14945b41dfcb, which corresponds to Mercurial ID d224fc999cb6accb208af0a105f14433375e2e77 (per git cinnabar git2hg). The gecko-dev equivalent is 6bb28c9903fe38d445cd2d3b17af4eabdade9335.
The only merge conflict was in .taskcluster.yml, which I suspect is about to become a running theme.
This merges from the same upstream commit that @brendandahl merged into https://github.com/mozilla/spidernode. The git-cinnabar commit ID is 199d8cb0035ba10a2fcd6afe2bdc14945b41dfcb, which corresponds to Mercurial ID d224fc999cb6accb208af0a105f14433375e2e77 (per
git cinnabar git2hg). The gecko-dev equivalent is 6bb28c9903fe38d445cd2d3b17af4eabdade9335.The only merge conflict was in .taskcluster.yml, which I suspect is about to become a running theme.