Skip to content

Instantly share code, notes, and snippets.

@SnabbBot

SnabbBot/log

Created June 9, 2016 14:12
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 SnabbBot/9f1969286ff21e825bf5ad3d0ba18d11 to your computer and use it in GitHub Desktop.
Save SnabbBot/9f1969286ff21e825bf5ad3d0ba18d11 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
log
Host: Linux davos 3.13.0-46-generic x86_64 Intel(R) Xeon(R) CPU E5-2603 v2 @ 1.80GHz
Image: eugeneia/snabb-nfv-test
Pull Request: #911
Current Head: 8fb375981b8281304063a607190026b0c5a0da1f
Pull Request Head: 4b275a43596f488590d07b237af6a5dd97428a87
SNABB_PCI0=0000:84:00.0 Ethernet controller: Intel Corporation 82599ES 10-Gigabit SFI/SFP+ Network Connection (rev 01)
SNABB_PCI1=0000:84:00.1 Ethernet controller: Intel Corporation 82599ES 10-Gigabit SFI/SFP+ Network Connection (rev 01)
SNABB_PCI_INTEL0=0000:84:00.0 Ethernet controller: Intel Corporation 82599ES 10-Gigabit SFI/SFP+ Network Connection (rev 01)
SNABB_PCI_INTEL1=0000:84:00.1 Ethernet controller: Intel Corporation 82599ES 10-Gigabit SFI/SFP+ Network Connection (rev 01)
ERROR: Failed to build 911
From https://github.com/snabbco/snabb
* [new ref] refs/pull/911/head -> pr911
Switched to branch 'pr911'
error: 'merge' is not possible because you have unmerged files.
hint: Fix them up in the work tree,
hint: and then use 'git add/rm <file>' as
hint: appropriate to mark resolution and make a commit,
hint: or use 'git commit -a'.
fatal: Exiting because of an unresolved conflict.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment