Set container pid for process in native driver
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Merge pull request #5643 from crosbymichael/fix-native-pid

Set container pid for process in native driver
Merge branch 'master' into bump_v0.11.0

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Merge pull request #4 from SvenDowideit/improve_mflag_usage_docs

update the docs for the new \n rendering
Merge pull request #5634 from vieux/improve_mflag_usage

Add support for \n in usages
The Go template is a better pattern for documentation.
mkimage-debootstrap: set ubuntuLatestLTS as Trusty

Ubuntu 14.04 LTS (Trusty Tahr) was released on Thu, 17 Apr 2014; Update
ubuntuLatestLTS accordingly.

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
Merge pull request #5642 from jmccrohan/master

Update mkimage-debootstrap "ubuntuLatestLTS" to "trusty"
Add "Should-Start" cgroupfs-mount and cgroup-lite to sysvinit-debian init script

It's fine to list both here because "Should-Start" is a loose binding (ie, if the listed service exists, it'll be started first, but otherwise, this one will start without it).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Change owner only on copied content

Fixes #5110
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Bump version to v0.11.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Merge pull request #5640 from crosbymichael/bump_v0.11.0

Bump version to v0.11.0
Merge branch 'release' into merge_release_v0.11.0

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Change version to v0.11.0-dev
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Merge pull request #5660 from crosbymichael/merge_release_v0.11.0

Merge release to master v0.11.0
Merge remote-tracking branch 'upstream/master'
Revert "rename configFile to auth in the job"

This reverts commit e9c3e397436221528312c0d3b291ae5a12862ed2.

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Revert "refactor build job to know only configFile"

This reverts commit b9731bccf2b2cc8c06ef8bdb41f72ca4791e63db.

Conflicts:
	server/server.go

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Fix error name typo (ErrInvalidWorikingDirectory)

Docker-DCO-1.1-Signed-off-by: Lars R. Damerow <lars@grandstreet.us> (github: bitness)
Merge pull request #5665 from vieux/fix_auth_issue

Fix auth issue