shixiong/okd @ e922dd4a43f927faf4a56769913fbd20531bdf42

Scott Dodson 69ec61ccd2 Merge pull request #4158 from ganhuang/lower_bool		8 роки тому
..
custom.conf.j2	a0c54c5742 Loosely couple docker to iptables service	8 роки тому
daemon.json	ff11a556c7 lower case in /etc/daemon.json and correct block-registry	8 роки тому
systemcontainercustom.conf.j2	cc18aa0edf Default to iptables on master	8 роки тому