Merge pull request #553 from crosbymichael/config

Add config file
2017-02-21 11:52:08 -08:00 · 2017-02-21 11:52:08 -08:00 · f01434283c
commit f01434283c
parent 23d3818060 a9950aedcf
16 changed files with 3374 additions and 41 deletions
--- a/cmd/ctr/pprof.go
+++ b/cmd/ctr/pprof.go
@ -23,7 +23,7 @@ var pprofCommand = cli.Command{
 		cli.StringFlag{
 			Name:  "debug-socket, d",
 			Usage: "socket path for containerd's debug server",
-			Value: "/run/containerd/containerd-debug.sock",
+			Value: "/run/containerd/debug.sock",
 		},
 	},
 	Subcommands: []cli.Command{