Merge branch 'master' of https://github.com/dotcloud/docker
Don't add yourself to the AUTHORs file - its generated

Last time I discussed this with @tianon, the AUTHORS was being
regenerated regularly, so we could remove this step.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Merge remote-tracking branch 'upstream/master'
chore(graph/graph): remove dead code

This code was introduced with commented out sections. Just delete them.

Original commit: 18fc707fdf06aeb50fa5250f59f0ef4597d7cf73

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Fix race condition during socket creation

Docker-DCO-1.1-Signed-off-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org> (github: glebfm)
man/docker-run.1: Fix typo 'priviledged', add missing closing brackets

Docker-DCO-1.1-Signed-off-by: Colin Walters <walters@verbum.org> (github: cgwalters)
add Tianon as maintainer of AUTHORS and .mailmap

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Change single-dash flag usage to double-dash

The single-dash long-form flag usage is deprecated.

Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathanleclaire@gmail.com> (github: nathanleclaire)
Add synchronization between jobs and server closing

Fixes #5154
Daemon waiting 15 seconds for finishing server jobs before shutdown. In
this time it doesn't accept new jobs. After this time, it shutdown
despite running jobs.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Make all cgroup stats output int64s instead of float64.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Merge pull request #5994 from vmarmol/libcontainers-stats

Make all cgroup stats output int64s instead of float64.
add recursive device nodes

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
update test

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Merge pull request #5995 from vieux/recur_nodes

Add device nodes recursively
Fix add hang when dest is .

Fixes #3960
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
adding test for hanging ADD src .

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Merge pull request #25 from tiborvass/3960-add-file-hangs

adding test for hanging ADD src .
Merge pull request #5997 from crosbymichael/add-hang

Fix add hang when dest is .
Add wait flag to iptables

Fixes #1573
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Merge pull request #5949 from nathanleclaire/patch-1

Change single-dash flag usage to double-dash