commit 4dc5990d7565a4a15d641bc6a0bc50a02cfcf302
author Tibor Vass <tiborvass@users.noreply.github.com> Wed Apr 13 14:03:42 2016 -0400
committer Tibor Vass <tiborvass@users.noreply.github.com> Wed Apr 13 14:03:42 2016 -0400
tree 19adf4dbc77a0a84020b632429e506acefec6d90
parent 365d80b3e157f6f236b1f54c59c31b2e830824f6
parent 2535db86781f2731024c945ecabd59199de0c727

Merge pull request #22006 from tiborvass/fix-changelog-1.11

Fix some CHANGELOG entries

hack/make.sh

diff --git a/hack/make.sh b/hack/make.sh
index 99da4c3..2674ec9 100755
--- a/hack/make.sh
+++ b/hack/make.sh
@@ -307,7 +307,7 @@
         if [ -x /usr/local/bin/docker-runc ]; then
             echo "Copying nested executables into $dir"
 	    for file in containerd containerd-shim containerd-ctr runc; do
-                cp "/usr/local/bin/docker-$file" "$dir/"
+                cp `which "docker-$file"` "$dir/"
                 if [ "$2" == "hash" ]; then
                     hash_files "$dir/docker-$file"
 		fi