[dhcp_relay] fix the compile error introduced by the fixed issue of '#3316', change the sample_output file of 'wait_for_intf.sh'#3325
Merged
jleveque merged 3 commits intosonic-net:masterfrom Aug 10, 2019
Conversation
…each interface.(sonic-net#3316) Signed-off-by: wangshengjun <[email protected]>
…ange the sample_output file of 'wait_for_intf.sh'. sonic-net#3316 Signed-off-by: wangshengjun <[email protected]>
jleveque
approved these changes
Aug 10, 2019
Contributor
|
Check builds are failing due to Jenkins issues. Merging this PR without passing check builds in order to fix image compilation. |
wangshengjun
added a commit
to wangshengjun/sonic-buildimage
that referenced
this pull request
Nov 16, 2020
…onic-net#3316', change the sample_output file of 'wait_for_intf.sh' (sonic-net#3325) Signed-off-by: wangshengjun <[email protected]>
VladimirKuk
pushed a commit
to Marvell-switching/sonic-buildimage
that referenced
this pull request
Jan 21, 2025
…lly (sonic-net#21387) #### Why I did it src/sonic-swss ``` * 4ff8153 - (HEAD -> master, origin/master, origin/HEAD) Add a delay between killing teamd processes (sonic-net#3325) (7 hours ago) [Saikrishna Arcot] ``` #### How I did it #### How to verify it #### Description for the changelog
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Signed-off-by: wangshengjun [email protected]
- What I did
change the sample_output file of 'wait_for_intf.sh' to fix the compile error.
'wait_for_intf.sh.j2' was changed by the commit id '7b0389d8a3a44a8351cb8195d1f308e48a2b087b'
- How I did it
change the sample_output file of 'wait_for_intf.sh' .
- How to verify it
Recompile ok after the change.