Resolving merge conflicts with master

2017-11-30 18:53:33 -06:00
parent 53f460ad9e a49d85186a
commit 538dd33ff2
5068 changed files with 25074 additions and 855452 deletions
@@ -13,7 +13,7 @@ spec:
  selector:
    app: nginx
 ---
-apiVersion: apps/v1beta2
+apiVersion: apps/v1beta2 # for versions before 1.8.0 use apps/v1beta1
 kind: StatefulSet
 metadata:
  name: web
@@ -45,4 +45,3 @@ spec:
      resources:
        requests:
          storage: 1Gi
-