Skip to content

Bindata fixes#721

Merged
tgraf merged 2 commits intomasterfrom
bindata-fixes
May 15, 2017
Merged

Bindata fixes#721
tgraf merged 2 commits intomasterfrom
bindata-fixes

Conversation

@jrajahalme
Copy link
Copy Markdown
Member

No description provided.

Jarno Rajahalme added 2 commits May 15, 2017 13:11
Remove file dbg.h.orig from bindata.  This file was apparently
accidentally included by commit 4795b9b ("bpf: Add
cilium_trace3() and use existing pad as arg3").

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
Add three ignore options to go-bindata target for:
1. Backup files with ".orig" suffix left behind by git.
2. Emacs backup files ending in '~'.
3. '.DS_Store' files sometimes left behind by OSX Finder.

A more long term solution would only include files tracked by git in
the first place.

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
@jrajahalme jrajahalme requested a review from tgraf May 15, 2017 20:17
@aanm
Copy link
Copy Markdown
Member

aanm commented May 15, 2017

@jrajahalme can you confirm #706 is no longer necessary?

@tgraf tgraf merged commit 5675f4c into master May 15, 2017
@tgraf tgraf deleted the bindata-fixes branch May 15, 2017 20:39
@jrajahalme
Copy link
Copy Markdown
Member Author

@aanm Sorry did not see that before, #706 is the same as the first commit here. So #706 is not needed anymore.

yoursanonymous pushed a commit to yoursanonymous/cilium that referenced this pull request Jan 31, 2026
Signed-off-by: Ankit Matth <ankitmatth111@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants