Merge branch 'opencomputeproject:master' into SER

azure-pipelines.yml

@@ -22,7 +22,7 @@ stages:
   - job:
 
     container:
-      image: sonicdev-microsoft.azurecr.io:443/sonic-slave-buster:latest
+      image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bullseye:latest
 
     displayName: "build"
     timeoutInMinutes: 60
@@ -34,7 +34,7 @@ stages:
     - script: |
         set -ex
         sudo apt-get update
-        sudo apt-get install -y thrift-compiler libthrift-0.11.0 libthrift-dev
+        sudo apt-get install -y thrift-compiler libthrift-dev
       displayName: "Install thrift compiler"
     - script: |
         set -ex

doc/ACL/SAI-Proposal-ACL-1.md

@@ -334,6 +334,7 @@ This example creates and ACL group with more than one ACL table and bind it to a
 
 ### Example 4 - Binding an ACL group to a set of ports
 This example creates an ACL group and binds it to multiple ports.
+
     // Bind this ACL group *acl_grp_id1* to port2, and port20s OID.
     port_attr_list.count = 1;
     port_attr_list.list[0].id = SAI_PORT_ATTR_INGRESS_ACL;

doc/SAI-Proposal-FRR.md

@@ -89,7 +89,7 @@ Entity.
 
 The switchover from the primary next hop to backup is triggered once a failure
 of a particular object is spotted.  This object can be a physical port, a tunnel
-interface, BFD session etc.
+interface, BFD session, ICMP ECHO session etc.
 
 It is preferred that the switchover is triggered by the switching entity without
 involving control plane in the process.  This way the amount of time it takes to
@@ -173,7 +173,7 @@ be of one of the types that the hardware is able to monitor.
 -  SAI\_NEXT\_HOP\_GROUP\_MEMBER\_ATTR\_MONITORED\_OBJECT
 
 This attribute allows the switching entity to monitor a specified object
-(BFD session, physical port, tunnel interface etc) and in case of its failure,
+(BFD session, ICMP ECHO session, physical port, tunnel interface etc) and in case of its failure,
 trigger a switchover.
 
 If the referred object fails, then the switch marks the next hop as FAILED and does not use it for forwarding.