Merge branch 'master-oss' into sethvargo/cli-magic

This commit is contained in:
Jeff Mitchell
2018-01-03 14:02:31 -05:00
1088 changed files with 95212 additions and 45132 deletions

View File

@@ -139,7 +139,7 @@ func (c *SecretsListCommand) detailedMounts(mounts map[string]*api.MountOutput)
}
}
out := []string{"Path | Type | Accessor | Plugin | Default TTL | Max TTL | Force No Cache | Replication | Description"}
out := []string{"Path | Type | Accessor | Plugin | Default TTL | Max TTL | Force No Cache | Replication | Seal Wrap | Description"}
for _, path := range paths {
mount := mounts[path]
@@ -151,7 +151,7 @@ func (c *SecretsListCommand) detailedMounts(mounts map[string]*api.MountOutput)
replication = "local"
}
out = append(out, fmt.Sprintf("%s | %s | %s | %s | %s | %s | %v | %s | %s",
out = append(out, fmt.Sprintf("%s | %s | %s | %s | %s | %s | %t | %s | %t | %s",
path,
mount.Type,
mount.Accessor,
@@ -160,6 +160,7 @@ func (c *SecretsListCommand) detailedMounts(mounts map[string]*api.MountOutput)
maxTTL,
mount.Config.ForceNoCache,
replication,
mount.SealWrap,
mount.Description,
))
}