Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@StormLiangMS
StormLiangMS committed Feb 14, 2023
1 parent 4c43a01 commit 6f6896f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/sonic-sairedis
Submodule sonic-sairedis updated 19 files
+3 −3 .azure-pipelines/build-template.yml
+0 −4 .github/codeql/codeql-config.yml
+0 −95 .github/workflows/codeql-analysis.yml
+0 −7 lib/RedisRemoteSaiInterface.cpp
+2 −2 lib/sairedis.h
+0 −1 lib/sairediscommon.h
+0 −7 meta/SaiSerialize.cpp
+0 −7 syncd/NotificationProcessor.cpp
+2 −17 syncd/Syncd.cpp
+0 −22 syncd/scripts/sai_failure_dump.sh
+2 −13 syncd/scripts/syncd_init_common.sh
+3 −46 syncd/tests.cpp
+0 −24 unittest/syncd/TestNotificationProcessor.cpp
+1 −2 unittest/vslib/Makefile.am
+3 −134 unittest/vslib/TestSwitchMLNX2700.cpp
+0 −115 unittest/vslib/TestVirtualSwitchSaiInterface.cpp
+0 −5 unittest/vslib/test_sai_vs_port.cpp
+2 −2 vslib/SwitchStateBase.cpp
+0 −6 vslib/VirtualSwitchSaiInterface.cpp

0 comments on commit 6f6896f

Please sign in to comment.