Merge remote-tracking branch 'origin/master' into cubbyhole-the-world

This commit is contained in:
Jeff Mitchell 2016-05-07 19:00:18 -04:00
commit f3a3fc3d55
2 changed files with 5 additions and 2 deletions

View File

@ -43,6 +43,8 @@ FEATURES:
IMPROVEMENTS:
* audit: Add the DisplayName value to the copy of the Request object embedded
in the associated Response, to match the original Request object [GH-1387]
* command/auth: Restore the previous authenticated token if the `auth` command
fails to authenticate the provided token [GH-1233]
* command/write: `-format` and `-field` can now be used with the `write`

View File

@ -94,8 +94,9 @@ func (f *FormatJSON) FormatResponse(
Error: errString,
Auth: JSONAuth{
Policies: auth.Policies,
Metadata: auth.Metadata,
DisplayName: auth.DisplayName,
Policies: auth.Policies,
Metadata: auth.Metadata,
},
Request: JSONRequest{