shixiong/okd @ 74e4c9d9976f0eb529fdd7fb21cd88ad1a47553f

OpenShift Bot 0c08ff121f Merge pull request #4152 from sdodson/iptables-default		пре 8 година
..
custom.conf.j2	a0c54c5742 Loosely couple docker to iptables service	пре 8 година
daemon.json	dd8f16c8b5 Rename blocked-registries to block-registries	пре 8 година
systemcontainercustom.conf.j2	cc18aa0edf Default to iptables on master	пре 8 година