shixiong/okd @ 9826ad6c9edcfeb9af9c3e7e166b402ba64ea4bf

Steve Milner bdf66ab41f Use local variables for daemon.json template		%!s(int64=8) %!d(string=hai) anos
..
custom.conf.j2	a0c54c5742 Loosely couple docker to iptables service	%!s(int64=8) %!d(string=hai) anos
daemon.json	bdf66ab41f Use local variables for daemon.json template	%!s(int64=8) %!d(string=hai) anos
systemcontainercustom.conf.j2	e360372dca Fix 1448368, and some other minors issues	%!s(int64=8) %!d(string=hai) anos