merge upstream/cluster-autoscaler-release-1.16

openshift · Oct 28, 2019 · 2ebb7af · 2ebb7af
2 parents c44b83d + f470bae
commit 2ebb7af
Show file tree

Hide file tree

Showing 13,628 changed files with 1,656,542 additions and 2,290,840 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,9 @@
 .idea/
 *.iml
 
+# VSCode project files
+**/.vscode
+
 # Emacs save files
 *~
 \#*\#
@@ -25,4 +28,3 @@
 Session.vim
 .netrwhist
 
-_output
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ services:
 language: go
 
 go:
-  - 1.11.2
+  - 1.12.1
 
 before_install:
   - sudo apt-get install libseccomp-dev -qq

diff --git a/Makefile b/Makefile
diff --git a/OWNERS b/OWNERS
@@ -1,11 +1,8 @@
-# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
-
 approvers:
-  - enxebre
-  - frobware
-  - ingvagabund
-  - bison
+- mwielgus
+- maciekpytel
+- bskiba
 reviewers:
-  - paulfantom
-  - spangenberg
-  - vikaschoudhary16
+- mwielgus
+- maciekpytel
+- bskiba
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ resource requests of a deployment based on the number of nodes in the Kubernetes
 Interested in autoscaling? Want to talk? Have questions, concerns or great ideas?
 
 Please join us on #sig-autoscaling at https://kubernetes.slack.com/, or join one
-of our weekly meetings.  See [the Kubernetes Community Repo](https://github.com/kubernetes/community/blob/master/sig-list.md) for more information.
+of our weekly meetings.  See [the Kubernetes Community Repo](https://github.com/kubernetes/community/blob/master/sig-autoscaling/README.md) for more information.
 
 ## Getting the Code
 

diff --git a/addon-resizer/.gitignore b/addon-resizer/.gitignore
@@ -1 +1,2 @@
 pod_nanny
+addon-resizer
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ services: @@
     language: go
     go:
-      - 1.11.2
+      - 1.12.1
     before_install:
       - sudo apt-get install libseccomp-dev -qq
@@ Expand Down @@