rebase with master

sonic-net · Sep 18, 2020 · 4f69c4a · 4f69c4a
1 parent 1043ee8
commit 4f69c4a
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/orchagent/portsorch.h b/orchagent/portsorch.h
@@ -235,9 +235,6 @@ class PortsOrch : public Orch, public Subject
     bool addTunnel(string tunnel,sai_object_id_t, bool learning=true);
     bool removeTunnel(Port tunnel);
 
-    bool addTunnel(string tunnel,sai_object_id_t, bool learning=true);
-    bool removeTunnel(Port tunnel);
-
     bool addPort(const set<int> &lane_set, uint32_t speed, int an=0, string fec="");
     sai_status_t removePort(sai_object_id_t port_id);
     bool initPort(const string &alias, const int index, const set<int> &lane_set);