Merge pull request #29153 from vishh/cadvisor-bump

Automatic merge from submit-queue Fix working_set calculation in kubelet Bump cadvisor dependencies to latest head. Fixes #28619
kubernetes · Jul 20, 2016 · 115ae62 · 115ae62
2 parents afe4977 + feb7321
commit 115ae62
Show file tree

Hide file tree

Showing 124 changed files with 5,812 additions and 1,953 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/LICENSES b/Godeps/LICENSES
diff --git a/hack/godep-save.sh b/hack/godep-save.sh
@@ -31,4 +31,7 @@ REQUIRED_BINS=(
 
 pushd "${KUBE_ROOT}" > /dev/null
   GO15VENDOREXPERIMENT=1 ${GODEP} save "${REQUIRED_BINS[@]}"
+  # A temporary workaround to prevent godep from not including recursive dependencies.
+  # This can be removed once a restore followed by a save does not drop dependencies.
+  GO15VENDOREXPERIMENT=1 ${GODEP} save "${REQUIRED_BINS[@]}"
 popd > /dev/null
diff --git a/hack/verify-godeps.sh b/hack/verify-godeps.sh
@@ -95,6 +95,8 @@ git init > /dev/null 2>&1
 
 # Recreate the Godeps using the nice clean set we just downloaded
 hack/godep-save.sh
+# Run it again to make godep include recursive dependencies.
+hack/godep-save.sh
 
 # Test for diffs
 if ! _out="$(diff -Naupr --ignore-matching-lines='^\s*\"GoVersion\":' --ignore-matching-line='^\s*\"GodepVersion\":' --ignore-matching-lines='^\s*\"Comment\":' ${KUBE_ROOT}/Godeps/Godeps.json ${_kubetmp}/Godeps/Godeps.json)"; then

diff --git a/vendor/github.com/Azure/go-ansiterm/LICENSE b/vendor/github.com/Azure/go-ansiterm/LICENSE
diff --git a/vendor/github.com/Azure/go-ansiterm/README.md b/vendor/github.com/Azure/go-ansiterm/README.md
diff --git a/vendor/github.com/Azure/go-ansiterm/constants.go b/vendor/github.com/Azure/go-ansiterm/constants.go
diff --git a/vendor/github.com/Azure/go-ansiterm/context.go b/vendor/github.com/Azure/go-ansiterm/context.go
diff --git a/vendor/github.com/Azure/go-ansiterm/csi_entry_state.go b/vendor/github.com/Azure/go-ansiterm/csi_entry_state.go
diff --git a/vendor/github.com/Azure/go-ansiterm/csi_param_state.go b/vendor/github.com/Azure/go-ansiterm/csi_param_state.go
diff --git a/vendor/github.com/Azure/go-ansiterm/escape_intermediate_state.go b/vendor/github.com/Azure/go-ansiterm/escape_intermediate_state.go