Use exec to replace bash with apache2 after environment is set up
Docker-DCO-1.1-Signed-off-by: Mike Naberezny <mike@naberezny.com> (github: mnaberez)
Update hack/make.sh with slightly clearer output and a more precise "are we in the Docker container?" check

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Add port allocator and move ipset into orderedintset

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Remove std sort and use custom sort for performances

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Refactor to support multiple ip addresses

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Simplify logic for registering ports

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Fix issues from rebase on master

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Improve test for container list `ps`

Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Clean up grammar on puppet.rst
Update puppet.rst
Release the push lock at the end

Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com> (github: amuino)
Fix for issue #3786

This is a fix for the case that one mount is inside another mount and
docker can't then delete the resulting container.

Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
Merge pull request #3756 from crosbymichael/fix-register-nobridge

Refactor and fix register interface when bridge does not exist
Merge pull request #3770 from aaronfeng/fix-image-name-pos

move image name into correct position
Merge pull request #3773 from mnaberez/supervisord-apache2-example

Use exec to replace bash with apache2 after environment is set up
Merge pull request #3781 from mattymo/patch-1

Clean up grammar on puppet.rst
Merge pull request #3542 from SvenDowideit/curl-prepare-commit-msg

move the contributing hook into contrib, and use curl in the same way as the gofmt above
Merge pull request #3776 from fabiofalci/container_list_test

Improve test for container list `ps`
Fix for #3674 Can't `rm` containers when disk full

Rather than creating a new directory and moving it there before
deleting that new directory, just move the directory we intend to
delete.

In the old way, the Mkdirall could fail, which meant that you
couldn't delete containers when the disk was full.

Tested.

Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
Merge pull request #3790 from crosbymichael/move-port-allocators

Move port allocators into network driver