Madhu Venugopal 8a421c2f1b Merge pull request #24954 from aboch/lnk ...

Fix regression on --link on bridge network
Upstream-commit: 48d0b811816fe7285644a8338c64879ecac7c2ca
Component: engine

2016-07-23 04:47:57 -07:00

..

caps

…

cluster

Update the errNoManager() to conform to swarm join-token

2016-07-22 00:32:24 -07:00

events

…

exec

…

graphdriver

Create zfs directory if it doesn't exist at startup.

2016-07-19 10:12:22 +10:00

links

…

logger

daemon/logger: fix races in channel close

2016-06-27 14:14:23 -07:00

network

api,daemon: cleanup some unused stuff

2016-06-21 14:15:19 -07:00

apparmor_default_unsupported.go

…

apparmor_default.go

…

archive_unix.go

…

archive_windows.go

…

archive.go

…

attach.go

…

auth.go

…

changes.go

…

commit.go

Windows: CMD not honouring arg escaping

2016-06-15 16:46:32 -07:00

config_experimental.go

…

config_solaris.go

…

config_stub.go

…

config_test.go

…

config_unix.go

Improve flag help consistency, and update docs

2016-07-16 01:58:01 +02:00

config_windows.go

Use "docker-runc" as alias for the default runtime

2016-06-22 11:59:26 -07:00

config.go

Improve flag help consistency, and update docs

2016-07-16 01:58:01 +02:00

container_operations_solaris.go

…

container_operations_unix.go

…

container_operations_windows.go

…

container_operations.go

Fix regression on --link on bridge network

2016-07-22 18:52:46 -07:00

container.go

Validate hostname starting from 1.24 API.

2016-07-06 09:13:59 +02:00

create_unix.go

…

create_windows.go

…

create.go

Validate hostname starting from 1.24 API.

2016-07-06 09:13:59 +02:00

daemon_experimental.go

Shutdown plugins during daemon shutdown.

2016-07-11 14:21:27 -07:00

daemon_linux_test.go

…

daemon_linux.go

…

daemon_solaris.go

Add --oom-score-adjust to daemon

2016-07-12 15:53:15 -07:00

daemon_stub.go

Shutdown plugins during daemon shutdown.

2016-07-11 14:21:27 -07:00

daemon_test.go

…

daemon_unix_test.go

…

daemon_unix.go

Vendor in new containerd

2016-07-18 11:44:24 -07:00

daemon_unsupported.go

…

daemon_windows.go

Add --oom-score-adjust to daemon

2016-07-12 15:53:15 -07:00

daemon.go

Do not rely on "live" event anymore

2016-07-19 08:24:39 -07:00

debugtrap_unix.go

…

debugtrap_unsupported.go

…

debugtrap_windows.go

…

delete_test.go

…

delete.go

…

discovery_test.go

…

discovery.go

…

errors.go

…

events_test.go

…

events.go

…

exec_linux.go

…

exec_solaris.go

…

exec_windows.go

…

exec.go

Update libcontainerd.AddProcess to accept a context

2016-07-19 08:24:39 -07:00

export.go

…

health_test.go

…

health.go

…

image_delete.go

update "image delete" error to match actual behavior

2016-07-18 23:17:55 +02:00

image_exporter.go

…

image_history.go

…

image_inspect.go

…

image_pull.go

…

image_push.go

…

image_tag.go

…

image.go

…

images.go

Treat digest only images as dangling

2016-06-30 11:32:49 -07:00

import.go

…

info.go

Fix panic when meminfo couldn't be read

2016-07-12 15:30:21 -04:00

inspect_solaris.go

…

inspect_unix.go

…

inspect_windows.go

…

inspect.go

…

keys_unsupported.go

Change root_maxkeys

2016-06-27 10:23:37 -07:00

keys.go

Change root_maxkeys

2016-06-27 10:23:37 -07:00

kill.go

…

links_test.go

…

links.go

…

list_unix.go

…

list_windows.go

…

list.go

Fixes #23596-returns empty string for NetworkID in response to /containers/json

2016-06-16 12:34:00 -07:00

logdrivers_linux.go

…

logdrivers_windows.go

…

logs_test.go

Fix panic while merging log configs to nil map

2016-07-12 15:24:42 -04:00

logs.go

Fix panic while merging log configs to nil map

2016-07-12 15:24:42 -04:00

monitor_linux.go

…

monitor_solaris.go

…

monitor_windows.go

…

monitor.go

Fixing bug in AttachStreams that would fail to close StdIn

2016-06-16 17:34:45 -07:00

mounts.go

…

names.go

…

network.go

Handle ingress sbox creation gracefully

2016-07-12 21:51:44 -07:00

oci_linux.go

fix some typos

2016-06-21 15:29:25 +08:00

oci_solaris.go

…

oci_windows.go

Windows: Added support for memory limit

2016-06-15 17:07:29 -07:00

pause.go

…

rename.go

No need for container.Lock if rename same name

2016-06-24 19:55:48 +02:00

resize.go

…

restart.go

…

search_test.go

…

search.go

…

seccomp_disabled.go

Fix seccomp output in docker info

2016-07-08 17:26:42 -07:00

seccomp_linux.go

Fix seccomp output in docker info

2016-07-08 17:26:42 -07:00

seccomp_unsupported.go

Fix seccomp output in docker info

2016-07-08 17:26:42 -07:00

selinux_linux.go

…

selinux_unsupported.go

…

start_linux.go

Update to new swarmkit/engine-api

2016-06-30 17:22:47 -07:00

start_windows.go

…

start.go

Improve error message for ENOTDIR errors

2016-07-18 11:12:33 -04:00

stats_collector_solaris.go

…

stats_collector_unix.go

…

stats_collector_windows.go

…

stats.go

…

stop.go

…

top_unix_test.go

Validate arguments for ps in docker top

2016-07-08 05:58:11 +00:00

top_unix.go

Validate arguments for ps in docker top

2016-07-08 05:58:11 +00:00

top_windows.go

…

unpause.go

…

update_linux.go

…

update_solaris.go

…

update_windows.go

…

update.go

Soften limitation of update kernel memory

2016-07-12 08:07:24 +08:00

volumes_unit_test.go

…

volumes_unix.go

…

volumes_windows.go

…

volumes.go

…

wait.go

…