Merge branch 'master' of github.com:hashicorp/vault

This commit is contained in:
captainill 2017-03-14 14:12:28 -07:00
commit c50dfb0356
3 changed files with 3 additions and 3 deletions

View File

@ -120,7 +120,7 @@ func handleSysGenerateRootUpdate(core *vault.Core) http.Handler {
if req.Key == "" { if req.Key == "" {
respondError( respondError(
w, http.StatusBadRequest, w, http.StatusBadRequest,
errors.New("'key' must specified in request body as JSON")) errors.New("'key' must be specified in request body as JSON"))
return return
} }

View File

@ -168,7 +168,7 @@ func handleSysRekeyUpdate(core *vault.Core, recovery bool) http.Handler {
if req.Key == "" { if req.Key == "" {
respondError( respondError(
w, http.StatusBadRequest, w, http.StatusBadRequest,
errors.New("'key' must specified in request body as JSON")) errors.New("'key' must be specified in request body as JSON"))
return return
} }

View File

@ -88,7 +88,7 @@ func handleSysUnseal(core *vault.Core) http.Handler {
if !req.Reset && req.Key == "" { if !req.Reset && req.Key == "" {
respondError( respondError(
w, http.StatusBadRequest, w, http.StatusBadRequest,
errors.New("'key' must specified in request body as JSON, or 'reset' set to true")) errors.New("'key' must be specified in request body as JSON, or 'reset' set to true"))
return return
} }