Merge remote-tracking branch 'upstream/master' into HEAD

2019-08-12 08:05:36 -05:00
parent 6daa99cdd8 4aa7723027
commit 5e8cf9b8a5
99 changed files with 1827 additions and 706 deletions
@@ -295,7 +295,7 @@ deleted by the Kubelet.
        "command": [
            "top"
        ],
-        "log_path":"busybox/0.log",
+        "log_path":"busybox.log",
        "linux": {
        }
      }