Skip to content
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

[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
merged 3 commits into from
Aug 10, 2019

Conversation

wangshengjun
Copy link
Contributor

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.

@jleveque
Copy link
Contributor

Check builds are failing due to Jenkins issues. Merging this PR without passing check builds in order to fix image compilation.

@jleveque jleveque merged commit 70febea into sonic-net:master Aug 10, 2019
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]>
mssonicbld added a commit that referenced this pull request Jan 13, 2025
…lly (#21387)

#### Why I did it
src/sonic-swss
```
* 4ff8153a - (HEAD -> master, origin/master, origin/HEAD) Add a delay between killing teamd processes (#3325) (7 hours ago) [Saikrishna Arcot]
```
#### How I did it
#### How to verify it
#### Description for the changelog
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
```
* 4ff8153a - (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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants