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
@@ -12,5 +12,4 @@ spec:
        image: perl
        command: ["perl",  "-Mbignum=bpi", "-wle", "print bpi(2000)"]
      restartPolicy: Never
-      backoffLimit: 4
-
+  backoffLimit: 4