Merge pull request #26839 from luxas/add_conntrack

Automatic merge from submit-queue Add conntrack to hyperkube Trivial fix for #26515 Please just pass through... @mikedanese @roberthbailey

Merge pull request #26839 from luxas/add_conntrack
6c549ae9 · k8s-merge-robot · 98c432a9 · e5247666 · 6c549ae9
Commit 6c549ae9 authored Jun 06, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

Dockerfile cluster/images/hyperkube/Dockerfile +1 -0

No files found.
--- a/cluster/images/hyperkube/Dockerfile
+++ b/cluster/images/hyperkube/Dockerfile
@@ -23,6 +23,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y \
    iptables \
    ethtool \
    ca-certificates \
+    conntrack \
    file \
    util-linux \
    socat \