Revert "allow overwrite in untar"

This reverts commit 5a3d774e5651da772a065282a1fb1a31e19e911c.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: vieux)
Revert "improve untar when using files instead of directories. Specifies behavior on non-existant targets."

This reverts commit 1c8d3106df0bd2aba304c7b3863949ca11c2b133.

Conflicts:
	archive/archive_test.go

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: vieux)
Tests for ADD tar

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)

Conflicts:
	integration-cli/docker_cli_build_test.go

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: vieux)
Bump version to v1.1.1

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Updated docker logs timestamp to RFC3339

Currently the docker logs timestamp flag generates log entries like:

    $ sudo docker logs -ft daemon_dave
    [May 10 13:06:17.934] hello world

It uses Go's StampMilli timestamp to generate the timestamp. The entry
is also wrapped in [ ].

This is non-standard operational timestamp and one that will require
custom parsing.

The new timestamp is RFC3999Nano and generates entries like:

    2014-05-10T17:42:14.999999999Z07:00 hello world

These are readily parsed by tools like ELK.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Merge pull request #6915 from vieux/bump_v1.1.1

Bump v1.1.1
Merge remote-tracking branch 'origin/release'

Conflicts:
	VERSION
	integration-cli/docker_cli_build_test.go

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Change version to 1.1.1-dev

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

Merge release v1.1.1
Replaced selected docs references to ADD with COPY

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Merge pull request #6931 from tiborvass/merge-5723

Updated docker logs timestamp to RFC3339 (carrying #5723)
Merge pull request #6942 from jamtur01/addcopy

Replaced selected docs references to ADD with COPY
Remove redundant checks in runconfig.Merge

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Cleanup Cmd on ENTRYPOINT instruction

Fixes #5147
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Inherit Cmd only if no --entrypoint specified on run

Fixes #5147
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)