New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix crash on merge conflict #404

Merged
merged 2 commits into from Apr 18, 2018

Conversation

Projects
None yet
1 participant
@notriddle
Member

notriddle commented Apr 18, 2018

No description provided.

@notriddle notriddle force-pushed the notriddle:merge_conflict branch from 3070398 to cb656f0 Apr 18, 2018

notriddle added some commits Apr 18, 2018

Stagger out batcher launches at bootup
Fixes a bunch of database timeouts right after restarting.

@notriddle notriddle force-pushed the notriddle:merge_conflict branch from cb656f0 to 8c78dd2 Apr 18, 2018

@notriddle

This comment has been minimized.

Member

notriddle commented Apr 18, 2018

bors r+

bors bot added a commit that referenced this pull request Apr 18, 2018

Merge #404
404: Fix crash on merge conflict r=notriddle a=notriddle



Co-authored-by: Michael Howell <michael@notriddle.com>
@bors

This comment has been minimized.

Contributor

bors bot commented Apr 18, 2018

@bors bors bot merged commit 8c78dd2 into bors-ng:master Apr 18, 2018

3 checks passed

Taskcluster (pull_request) TaskGroup: success
Details
bors Build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@notriddle notriddle deleted the notriddle:merge_conflict branch Apr 18, 2018

notriddle added a commit to bors-ng/bors-ng.github.io that referenced this pull request Apr 19, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment