Sagar Balani 01eca58507 Merge remote-tracking branch 'remotes/AzureSonic/master' into sonicSaiv1.3 ... * Resolve conflicts		2018-05-14 11:40:15 -07:00
..
base_image_files	[base image files] All 'docker exec' wrapper scripts now dynamically adjust their flags depending on whether or not they are run on a terminal (#1507)	2018-03-17 00:43:29 -07:00
Dockerfile.j2	merge with Azure master (12/12/17)	2017-12-12 20:07:42 -08:00
ipinip.json.j2	[zebra.conf] Fix template issue with multiple lo addresses (#1662)	2018-05-01 20:53:47 -07:00
orchagent.sh	resolve conflicts	2018-03-13 19:06:21 -07:00
ports.json.j2	Buffers configuration update on port speed change (#1345)	2018-01-29 08:11:05 -08:00
start.sh	[sonic-cfggen] Remove machine.conf info and add get_system_mac support (#1397)	2018-02-20 14:38:13 -08:00
supervisord.conf	Buffers configuration update on port speed change (#1345)	2018-01-29 08:11:05 -08:00
switch.json.j2	[swss]: Change the hash seed to 0 for ToR and 10 for Leaf routers (#1667)	2018-05-01 21:58:33 -07:00
swssconfig.sh	Merge remote-tracking branch 'remotes/AzureSonic/master' into sonicSaiv1.3	2018-05-14 11:40:15 -07:00