Skip to content

Commit

Permalink
Merge pull request #1382 from losipiuk/lo/cluster-autoscaler-release-…
Browse files Browse the repository at this point in the history
…1.12-godeps

Update godeps
  • Loading branch information
k8s-ci-robot authored Nov 6, 2018
2 parents 33f60bc + 786234e commit 401e070
Show file tree
Hide file tree
Showing 252 changed files with 191,503 additions and 5,355 deletions.
3,093 changes: 1,598 additions & 1,495 deletions cluster-autoscaler/Godeps/Godeps.json

Large diffs are not rendered by default.

30 changes: 6 additions & 24 deletions cluster-autoscaler/kubernetes.sync
Original file line number Diff line number Diff line change
@@ -1,26 +1,8 @@
commit 8e329f1c3cbb1354c27b6135990c5544f14d2a17
Merge: 4bc9e94fee 07ebe323fa
Author: Kubernetes Submit Queue <k8s-merge[email protected]>
Date: Thu Sep 6 00:02:02 2018 -0700
commit d05f0e76b094d85df3a071ff80c27d66a0c05695 (origin/release-1.12)
Merge: d3bc471868 7d4b3e7a6f
Author: k8s-ci-robot <k8s-ci[email protected]>
Date: Sun Nov 4 21:48:17 2018 -0800

Merge pull request #68312 from msau42/fix-e2e
Merge pull request #70399 from feiskyer/automated-cherry-pick-of-#70353-upstream-release-1.12

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md.

Fix gce localssd pv tests

**What this PR does / why we need it**:
When running local PV tests against GCE local SSD, it directly uses the disk so doesn't need to create a tmp dir like the other test formats. Fsgroup tests do not create test-file so don't error on cleanup if the file doesn't exist.


**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #68308

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```

Automated cherry pick of #70353: Improve Azure instance metadata handling

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions cluster-autoscaler/vendor/github.com/Rican7/retry/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

83 changes: 83 additions & 0 deletions cluster-autoscaler/vendor/github.com/Rican7/retry/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

101 changes: 101 additions & 0 deletions cluster-autoscaler/vendor/github.com/Rican7/retry/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 401e070

Please sign in to comment.