shixiong/okd @ a395b2b4d6cfd65e1a2fb45a75d72a0c1d9c65bc

Scott Dodson a2d9da8c95 Merge pull request #2786 from dgoodwin/docker-1.12		%!s(int64=8) %!d(string=hai) anos
..
restart.yml	cd9dd38ec3 Use openshift.common.hostname when verifying API port available.	%!s(int64=8) %!d(string=hai) anos
upgrade.yml	29cea9cf97 Remove spurious argument	%!s(int64=8) %!d(string=hai) anos
upgrade_check.yml	a2d9da8c95 Merge pull request #2786 from dgoodwin/docker-1.12	%!s(int64=8) %!d(string=hai) anos