Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Brad Rydzewski 2016-05-10 18:15:36 -07:00
commit fbdc82fe16

View file

@ -107,8 +107,8 @@ var AgentCmd = cli.Command{
Value: &cli.StringSlice{ Value: &cli.StringSlice{
"plugins/docker", "plugins/docker",
"plugins/docker:*", "plugins/docker:*",
"plguins/gcr", "plugins/gcr",
"plguins/gcr:*", "plugins/gcr:*",
"plugins/ecr", "plugins/ecr",
"plugins/ecr:*", "plugins/ecr:*",
}, },