merge origin master

2018-09-17 10:33:51 -07:00
parent 3286b00f58 f5b05a4e4e
commit 4d7691ecfc
61 changed files with 541 additions and 4130 deletions
@@ -181,7 +181,7 @@ status:
      lastTransitionTime: 2018-01-01T00:00:00Z
    - type: "www.example.com/feature-1"   # an extra PodCondition
      status: "False"
-      lastProbeTIme: null
+      lastProbeTime: null
      lastTransitionTime: 2018-01-01T00:00:00Z
  containerStatuses:
    - containerID: docker://abcd...