cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/4.4 to 72e06b4
Date Fri, 08 Aug 2014 10:54:47 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 de85c4d55 -> 72e06b4d9


CLOUDSTACK-6323: Change getUser API arg to userapikey

By default the getUser API picks apikey arg from HTTP request to return the
User object with that api key. We use apikey in the request, so it would return
the same user calling the API. This commit uses the USER_API_KEY in the API
annotation instead.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/72e06b4d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/72e06b4d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/72e06b4d

Branch: refs/heads/4.4
Commit: 72e06b4d9b40c42d28cc148a331c9c5461a10f6e
Parents: de85c4d
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Fri Aug 8 12:52:58 2014 +0200
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Fri Aug 8 12:52:58 2014 +0200

----------------------------------------------------------------------
 .../org/apache/cloudstack/api/command/admin/user/GetUserCmd.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/72e06b4d/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
index f8c7589..51fa8ee 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
@@ -39,7 +39,7 @@ public class GetUserCmd extends BaseCmd {
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
 
-    @Parameter(name = ApiConstants.API_KEY, type = CommandType.STRING, required = true, description
= "API key of the user")
+    @Parameter(name = ApiConstants.USER_API_KEY, type = CommandType.STRING, required = true,
description = "API key of the user")
     private String apiKey;
 
     /////////////////////////////////////////////////////


Mime
View raw message