Merge remote-tracking branch 'upstream/master' into buffers_port_speed

sonic-net · Jan 29, 2018 · 6997ce3 · 6997ce3
2 parents be97cfd + da10ff5
commit 6997ce3
Show file tree

Hide file tree

Showing 58 changed files with 2,011 additions and 1,621 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,6 +35,7 @@ src/sonic-device-data/src/device/
 src/sonic-device-data/src/debian/
 src/supervisor/*
 !src/supervisor/Makefile
+!src/supervisor/patch/
 src/thrift/*
 !src/thrift/Makefile
 

diff --git a/.gitmodules b/.gitmodules
@@ -50,6 +50,9 @@
 [submodule "platform/broadcom/sonic-platform-modules-ingrasys"]
 	path = platform/broadcom/sonic-platform-modules-ingrasys
 	url = https://github.com/Ingrasys-sonic/sonic-platform-modules-ingrasys
+[submodule "src/sonic-platform-common"]
+	path = src/sonic-platform-common
+	url = https://github.com/Azure/sonic-platform-common
 [submodule "src/sonic-platform-daemons"]
 	path = src/sonic-platform-daemons
 	url = https://github.com/Azure/sonic-platform-daemons