Vincent Demeester cbbd824f10 Merge pull request #24548 from cpuguy83/24167_fix_log_config_merge ...

Fix panic while merging log configs to nil map
Upstream-commit: 7a1442baf6e31b3c94a2e9fd92155a75c1987868
Component: engine

2016-07-12 23:40:47 +02:00

components/engine

Merge pull request #24548 from cpuguy83/24167_fix_log_config_merge

2016-07-12 23:40:47 +02:00

S

Description

No description provided

310 MiB

Languages

Go 92%

Shell 5.5%

Dockerfile 1.1%

Go-Checksums 0.9%

Makefile 0.3%

Other 0.2%