Submodule update src/sonic-platform-daemons and src/sonic-swss#11456
Closed
jaganbal-a wants to merge 1 commit intosonic-net:masterfrom
jaganbal-a:master
Closed
Submodule update src/sonic-platform-daemons and src/sonic-swss#11456jaganbal-a wants to merge 1 commit intosonic-net:masterfrom jaganbal-a:master
jaganbal-a wants to merge 1 commit intosonic-net:masterfrom
jaganbal-a:master
Conversation
Contributor
|
@jaganbal-a can you rebase to latest master? |
Collaborator
|
There are changes not related to submodule update. Is it a mistake? |
Contributor
Author
Looks like I have accidentally brought this commits during the rebase process. let me check how to remove this. |
Submodule update src/sonic-platform-daemons and src/sonic-swss
Contributor
|
@jaganbal-a can you remove the submodule update for swss since that is already updated now. Keep only sonic-platform-daemon submodule update. Try doing a rebase as well. |
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.
Submodule update src/sonic-platform-daemons and src/sonic-swss
src/sonic-platform-daemons:
e889625 (HEAD -> master, origin/master, origin/HEAD) [ycabled][grpc] Fix some time interval,options for grpc keep alive to work (#271)
1651050 [ycabled] add some retry logic for gRPC channel setup;fix no channel gRPC notification (#269)
7c0be24 [CMIS]Improved 400G link bring up sequence (#254)
df447b4 [ycabled] Fix the init values for active-active ports (#266)
ec84af4 [sonic-ycabled] fix grpc logic for timeout,cli HWSTATUS value retrival logic for active-active cable (#264)
src/sonic-swss
24a0797 (HEAD -> master, origin/master, origin/HEAD) [muxorch] Always use direct link for SoC IPs (#2369)
3fd812d Orchagent changes for synchronizing npu/phy device Tx in the data path before enabling transceiver Tx. (#2277)
47f6162 Run individule pytests instead of running all pytests at once. (#2350)
0c3c9c6 Replace swsssdk with swsscommon (#2368)
bf91a49 Add BGP profile to Vnet routes (#2337)
fe11cc7 Fix mux_acl_rule adding issue (#2356)
f565f7d Fix: missing sonic-db-cli in docker-sonic-vs image (#2357)
Why I did it
To include the following commits.
[CMIS]Improved 400G link bring up sequence (sonic-net/sonic-platform-daemons#254)
#2277, update the src/sonic-swss up to the following PR commit while updating src/sonic-platform-daemons.
(sonic-net/sonic-swss#2277)