Vincent Demeester 50c6561a9e Merge pull request #35949 from yongtang/34248-carry ...

Carry #34248 Added tag log option to json-logger and use RawAttrs
Upstream-commit: ea74dbe907f534ba2f59c1173330987c3fa84208
Component: engine

2018-01-22 15:02:54 -08:00

..

caps

Copy Inslice() to those parts that use it

2017-11-10 13:42:38 +08:00

cluster

Merge pull request #36003 from pradipd/upgrade_fix

2018-01-19 15:46:50 -05:00

config

Golint: remove redundant ifs

2018-01-15 00:42:25 +01:00

discovery

…

events

Update TestLogEvents to not use deprecated Status field

2017-12-20 12:49:51 +01:00

exec

Remove libcontainerd.IOPipe

2018-01-09 12:00:28 -05:00

graphdriver

Merge pull request #36051 from Microsoft/jjh/remotefs-read-return-error

2018-01-19 11:27:13 -08:00

initlayer

Remove redundant build-tags

2017-12-18 17:41:53 +01:00

links

…

listeners

Remove Solaris files

2017-12-18 17:22:25 +01:00

logger

Carry 34248 Added tag log option to json-logger and use RawAttrs

2018-01-19 17:51:20 +00:00

names

…

network

…

stats

Remove redundant build-tags

2017-12-18 17:41:53 +01:00

testdata

…

apparmor_default_unsupported.go

…

apparmor_default.go

…

archive_tarcopyoptions_unix.go

…

archive_tarcopyoptions_windows.go

Remove redundant build-tags

2017-12-18 17:41:53 +01:00

archive_tarcopyoptions.go

…

archive_unix.go

…

archive_windows.go

…

archive.go

Move api/errdefs to errdefs

2018-01-11 21:21:43 -05:00

attach.go

Move api/errdefs to errdefs

2018-01-11 21:21:43 -05:00

auth.go

…

bindmount_unix.go

…

build.go

Address feedback from Tonis

2018-01-18 12:30:39 -08:00

cache.go

LCOW: Re-coalesce stores

2018-01-18 08:29:19 -08:00

changes.go

…

checkpoint.go

Don't append the container id to custom directory checkpoints. Fixes #34601.

2017-12-04 14:24:35 -05:00

cluster.go

…

commit.go

Address feedback from Tonis

2018-01-18 12:30:39 -08:00

configs_linux.go

Remove redundant build-tags

2017-12-18 17:41:53 +01:00

configs_unsupported.go

…

configs_windows.go

Remove redundant build-tags

2017-12-18 17:41:53 +01:00

configs.go

…

container_linux.go

Move api/errdefs to errdefs

2018-01-11 21:21:43 -05:00

container_operations_unix.go

Make container resource mounts unbindable

2018-01-16 15:09:05 -05:00

container_operations_windows.go

Make container resource mounts unbindable

2018-01-16 15:09:05 -05:00

container_operations.go

Disable service on release network

2018-01-17 14:19:51 -08:00

container_windows.go

Remove redundant build-tags

2017-12-18 17:41:53 +01:00

container.go

Move api/errdefs to errdefs

2018-01-11 21:21:43 -05:00

create_unix.go

…

create_windows.go

…

create.go

Address feedback from Tonis

2018-01-18 12:30:39 -08:00

daemon_linux_test.go

Added validation of isolation settings on daemon.verifyContainerSettings

2017-11-20 10:34:20 +01:00

daemon_linux.go

…

daemon_test.go

Merge pull request #36021 from yongtang/30897-follow-up

2018-01-16 09:38:16 +01:00

daemon_unix_test.go

Remove solaris build tag and `contrib/mkimage/solaris

2017-11-02 00:01:46 +00:00

daemon_unix.go

LCOW: Re-coalesce stores

2018-01-18 08:29:19 -08:00

daemon_unsupported.go

Remove solaris build tag and `contrib/mkimage/solaris

2017-11-02 00:01:46 +00:00

daemon_windows_test.go

…

daemon_windows.go

LCOW: Re-coalesce stores

2018-01-18 08:29:19 -08:00

daemon.go

Address feedback from Tonis

2018-01-18 12:30:39 -08:00

debugtrap_unix.go

…

debugtrap_unsupported.go

Remove solaris build tag and `contrib/mkimage/solaris

2017-11-02 00:01:46 +00:00

debugtrap_windows.go

…

delete_test.go

…

delete.go

Address feedback from Tonis

2018-01-18 12:30:39 -08:00

dependency.go

…

disk_usage.go

LCOW: Refactor to multiple layer-stores based on feedback

2018-01-18 08:31:05 -08:00

errors.go

Move api/errdefs to errdefs

2018-01-11 21:21:43 -05:00

events_test.go

…

events.go

…

exec_linux.go

…

exec_windows.go

…

exec.go

Merge pull request #35744 from ndeloof/35702

2018-01-19 15:03:50 -08:00

export.go

Address feedback from Tonis

2018-01-18 12:30:39 -08:00

getsize_unix.go

LCOW: Refactor to multiple layer-stores based on feedback

2018-01-18 08:31:05 -08:00

health_test.go

container: protect the health status with mutex

2017-11-16 15:04:01 -08:00

health.go

introduce « exec_die » event

2018-01-08 11:42:25 +01:00

image_delete.go

Address feedback from Tonis

2018-01-18 12:30:39 -08:00

image_exporter.go

LCOW: Refactor to multiple layer-stores based on feedback

2018-01-18 08:31:05 -08:00

image_history.go

LCOW: Refactor to multiple layer-stores based on feedback

2018-01-18 08:31:05 -08:00

image_inspect.go

Address feedback from Tonis

2018-01-18 12:30:39 -08:00

image_pull.go

LCOW: Re-coalesce stores

2018-01-18 08:29:19 -08:00

image_push.go

LCOW: Refactor to multiple layer-stores based on feedback

2018-01-18 08:31:05 -08:00

image_tag.go

LCOW: Re-coalesce stores

2018-01-18 08:29:19 -08:00

image.go

LCOW: Refactor to multiple layer-stores based on feedback

2018-01-18 08:31:05 -08:00

images.go

Address feedback from Tonis

2018-01-18 12:30:39 -08:00

import.go

LCOW: Refactor to multiple layer-stores based on feedback

2018-01-18 08:31:05 -08:00

info_unix_test.go

…

info_unix.go

Use containerd API to get version

2017-11-03 01:46:58 +01:00

info_windows.go

…

info.go

LCOW: Refactor to multiple layer-stores based on feedback

2018-01-18 08:31:05 -08:00

inspect_linux.go

Remove Solaris files

2017-12-18 17:22:25 +01:00

inspect_windows.go

…

inspect.go

Move api/errdefs to errdefs

2018-01-11 21:21:43 -05:00

keys_unsupported.go

…

keys.go

…

kill.go

Move api/errdefs to errdefs

2018-01-11 21:21:43 -05:00

links.go

…

list_unix.go

Remove solaris build tag and `contrib/mkimage/solaris

2017-11-02 00:01:46 +00:00

list_windows.go

…

list.go

LCOW: Re-coalesce stores

2018-01-18 08:29:19 -08:00

logdrivers_linux.go

…

logdrivers_windows.go

…

logs_test.go

…

logs.go

Move api/errdefs to errdefs

2018-01-11 21:21:43 -05:00

metrics_unix.go

…

metrics_unsupported.go

…

metrics.go

daemon.cleanupMetricsPlugins(): fix

2018-01-16 15:15:11 -08:00

monitor_linux.go

…

monitor_windows.go

…

monitor.go

introduce « exec_die » event

2018-01-08 11:42:25 +01:00

mounts.go

…

names.go

Move api/errdefs to errdefs

2018-01-11 21:21:43 -05:00

network.go

Merge pull request #36021 from yongtang/30897-follow-up

2018-01-16 09:38:16 +01:00

oci_linux_test.go

Fix "duplicate mount point" when --tmpfs /dev/shm is used

2017-11-20 18:48:27 -08:00

oci_linux.go

Make container resource mounts unbindable

2018-01-16 15:09:05 -05:00

oci_windows.go

Merge pull request #35830 from cpuguy83/unbindable_shm

2018-01-19 17:43:30 -08:00

pause.go

Golint: remove redundant ifs

2018-01-15 00:42:25 +01:00

prune.go

LCOW: Refactor to multiple layer-stores based on feedback

2018-01-18 08:31:05 -08:00

reload_test.go

Add option to enable networkDB debug

2017-12-06 13:19:47 -08:00

reload.go

Fix golint error

2018-01-15 21:35:30 +00:00

rename.go

Move api/errdefs to errdefs

2018-01-11 21:21:43 -05:00

resize.go

…

restart.go

…

search_test.go

…

search.go

…

seccomp_disabled.go

…

seccomp_linux.go

…

seccomp_unsupported.go

…

secrets_linux.go

Remove redundant build-tags

2017-12-18 17:41:53 +01:00

secrets_unsupported.go

…

secrets_windows.go

Remove redundant build-tags

2017-12-18 17:41:53 +01:00

secrets.go

…

selinux_linux.go

Remove redundant build-tags

2017-12-18 17:41:53 +01:00

selinux_unsupported.go

…

start_unix.go

Move api/errdefs to errdefs

2018-01-11 21:21:43 -05:00

start_windows.go

…

start.go

Merge pull request #35830 from cpuguy83/unbindable_shm

2018-01-19 17:43:30 -08:00

stats_collector.go

…

stats_unix.go

…

stats_windows.go

…

stats.go

Remove solaris files

2017-10-24 15:39:34 -04:00

stop.go

Move api/errdefs to errdefs

2018-01-11 21:21:43 -05:00

top_unix_test.go

…

top_unix.go

…

top_windows.go

…

trustkey_test.go

…

trustkey.go

…

unpause.go

Golint: remove redundant ifs

2018-01-15 00:42:25 +01:00

update_linux.go

Ensure CPU quota/period updates are sent to runc

2018-01-16 11:50:14 -05:00

update_windows.go

Remove Solaris files

2017-12-18 17:22:25 +01:00

update.go

Move api/errdefs to errdefs

2018-01-11 21:21:43 -05:00

volumes_unit_test.go

…

volumes_unix_test.go

…

volumes_unix.go

Merge pull request #34224 from estesp/no-chown-nwfiles-outside-metadata

2017-11-02 15:00:42 -07:00

volumes_windows.go

Remove redundant build-tags

2017-12-18 17:41:53 +01:00

volumes.go

Move api/errdefs to errdefs

2018-01-11 21:21:43 -05:00

wait.go

…

workdir.go

…