Skip to content
This repository has been archived by the owner on Aug 29, 2018. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1060834
  • Loading branch information
Dan McPherson committed Feb 6, 2014
1 parent e5717ee commit 778abb6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion broker/doc/html/16/key-response-deletesshkey-1-6.html
Expand Up @@ -7,7 +7,7 @@
"field": null,
"index": null,
"severity": "info",
"text": "Deleted SSH key mykey"
"text": "Removed SSH key mykey"
}
],
"status": "ok",
Expand Down
2 changes: 1 addition & 1 deletion broker/doc/html/16/rest-api-1-6.html
Expand Up @@ -581,7 +581,7 @@ <h5>Response</h5>
"field": null,
"index": null,
"severity": "info",
"text": "Deleted SSH key mykey"
"text": "Removed SSH key mykey"
}
],
"status": "ok",
Expand Down
4 changes: 2 additions & 2 deletions controller/app/controllers/keys_controller.rb
Expand Up @@ -69,7 +69,7 @@ def update

result = @cloud_user.update_ssh_key(key)
ssh_key = RestKey.new(key, get_url, nolinks)
render_success(:ok, "key", ssh_key, "Updates SSH key #{id} for user #{@cloud_user.login}", result, nil, 'IP' => request.remote_ip)
render_success(:ok, "key", ssh_key, "Updated SSH key #{id} for user #{@cloud_user.login}", result, nil, 'IP' => request.remote_ip)
end

#DELETE /user/key/[name]
Expand All @@ -82,6 +82,6 @@ def destroy

result = @cloud_user.remove_ssh_key(id)
status = requested_api_version <= 1.4 ? :no_content : :ok
render_success(status, nil, nil, "Deleted SSH key #{id}", result)
render_success(status, nil, nil, "Removed SSH key #{id}", result)
end
end

0 comments on commit 778abb6

Please sign in to comment.