UPSTREAM: google/cadvisor: 1963: container: fix concurrent map acccess

[runcom]

Signed-off-by: Antonio Murdaca [email protected]

@sjenning PTAL, picks google#1963 for https://bugzilla.redhat.com/show_bug.cgi?id=1590563

/cc @deads2k

[sjenning]

merged upstream and lgtm

[liggitt]

this got pulled into dep update in openshift/origin#19992 and doesn't appear to compile... is there a coordinating PR required?

# github.com/openshift/origin/vendor/github.com/google/cadvisor/container/docker
vendor/github.com/google/cadvisor/container/docker/handler.go:250:9: handler.restartCount undefined (type *dockerContainerHandler has no field or method restartCount)
[ERROR] [18:10:08+0000] PID 78: hack/lib/build/binaries.sh:236: `GOOS=${platform%/*} GOARCH=${platform##*/} go install -pkgdir "${pkgdir}/${platform}" -tags "${OS_GOFLAGS_TAGS-} ${!platform_gotags_envvar:-}" -ldflags="${local_ldflags}" "${goflags[@]:+${goflags[@]}}" -gcflags "${gogcflags}" "${nonstatics[@]}"` exited with status 2.

[deads2k]

this got pulled into dep update in openshift/origin#19992 and doesn't appear to compile... is there a coordinating PR required?

update glide.yaml to point to a SHA and they'll deal with it.

[sjenning]

this line needed to be removed

[sjenning]

it is correct upstream :-/ not sure how it didn't make the pick.

[runcom]

I'm not sure either indeed, my bad guys