Submodule update #1351
Merged
Submodule update #1351
Conversation
This file contains 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
jleveque
approved these changes
Jan 30, 2018
|
conflict, can you check? |
|
The conflict is kind of expected with Qi's PR #1350. And it should be easy to resolve. Looks like we cannot solve it online. Prince, I think what you need to do is: from your working branch, do a 'git fetch origin', then "git rebase -i origin/master", then take your change on snmp repo. then force push to your fork. We can do it together tomorrow if you'd like to. Regards, |
|
@yxieca, I did a merge from upstream and seems to have resolved the conflict. Can you check. |
yxieca
approved these changes
Jan 30, 2018
This was referenced Jan 30, 2018
|
@prsunny what's this pull request's update? |
sonic-otn
pushed a commit
to Weitang-Zheng/sonic-buildimage
that referenced
this pull request
Mar 11, 2024
…tically (sonic-net#18068) #### Why I did it src/sonic-sairedis ``` * a504933 - (HEAD -> master, origin/master, origin/HEAD) Change dash API pipeline name (sonic-net#1351) (11 hours ago) [Kamil Cudnik] ``` #### How I did it #### How to verify it #### Description for the changelog
saksarav-nokia
pushed a commit
to saksarav-nokia/sonic-buildimage
that referenced
this pull request
Mar 12, 2024
…tically (sonic-net#18068) #### Why I did it src/sonic-sairedis ``` * a504933 - (HEAD -> master, origin/master, origin/HEAD) Change dash API pipeline name (sonic-net#1351) (11 hours ago) [Kamil Cudnik] ``` #### 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
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.
- What I did
Submodule update for