Skip to content

Commit

Permalink
Merge pull request sonic-net#46 from mssonicbld/sonicbld/202205-merge
Browse files Browse the repository at this point in the history
[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205
  • Loading branch information
mssonicbld authored Jun 24, 2023
2 parents e2f6b66 + 1ade9e6 commit cf1f10b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -2093,3 +2093,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
cmic_dma_abort_in_cold_boot=0
sai_pfc_dlr_init_capability=0
sai_disable_srcmacqedstmac_ctrl=1
trunk_group_max_members=16
Original file line number Diff line number Diff line change
Expand Up @@ -2094,3 +2094,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
cmic_dma_abort_in_cold_boot=0
sai_pfc_dlr_init_capability=0
sai_disable_srcmacqedstmac_ctrl=1
trunk_group_max_members=16
Original file line number Diff line number Diff line change
Expand Up @@ -2095,3 +2095,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
cmic_dma_abort_in_cold_boot=0
sai_pfc_dlr_init_capability=0
sai_disable_srcmacqedstmac_ctrl=1
trunk_group_max_members=16
Original file line number Diff line number Diff line change
Expand Up @@ -2097,3 +2097,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
cmic_dma_abort_in_cold_boot=0
sai_pfc_dlr_init_capability=0
sai_disable_srcmacqedstmac_ctrl=1
trunk_group_max_members=16
2 changes: 1 addition & 1 deletion device/nokia/x86_64-nokia_ixr7250e_sup-r0/chassisdb.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
start_chassis_db=1
chassis_db_address=10.6.0.100
lag_id_start=1
lag_id_end=512
lag_id_end=1024

0 comments on commit cf1f10b

Please sign in to comment.