tree 5bbafad5e7d8420aa960df93624c80b654bda855
parent 53a9b1c77be3316a4cc2ab2f997a1eaa4da0e7ba
parent f1cd0cabba47ba05400e7a609dffb571592a61e0
author Arnaud Porterie <arnaud.porterie@docker.com> 1455132988 -0800
committer Arnaud Porterie <arnaud.porterie@docker.com> 1455132988 -0800

Merge pull request #20195 from tiborvass/1.10.1-cherrypicks

1.10.1 cherrypicks