Skip to content

Instantly share code, notes, and snippets.

@dpino

dpino/log

Created March 3, 2016 11:14
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save dpino/edcdeaea862eabe2338e to your computer and use it in GitHub Desktop.
Save dpino/edcdeaea862eabe2338e to your computer and use it in GitHub Desktop.
Download ZIP
Raw
log
Host: Linux snabb1 3.18.24 x86_64 Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
Image: eugeneia/snabb-nfv-test
Pull Request: #255
Current Head: a87632fcac922415cbfcec763a86b53d9a7ebc99
Pull Request Head: 6b924923c7e2940af8105f728857a91caa8ab5c7
ERROR: Failed to build 255
From https://github.com/igalia/snabbswitch
* [new ref] refs/pull/255/head -> pr255
Switched to branch 'pr255'
Auto-merging src/program/lwaftr/setup.lua
CONFLICT (content): Merge conflict in src/program/lwaftr/setup.lua
Automatic merge failed; fix conflicts and then commit the result.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment