cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] rafaelweingartner closed pull request #2597: UpdateUserCmd: apiSecretKey refers to itself
Date Tue, 24 Apr 2018 14:27:06 GMT
rafaelweingartner closed pull request #2597: UpdateUserCmd: apiSecretKey refers to itself
URL: https://github.com/apache/cloudstack/pull/2597
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
index e6ac36719e3..91ccede90da 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
@@ -61,12 +61,12 @@
 
     @Parameter(name = ApiConstants.PASSWORD,
             type = CommandType.STRING,
-            description = "Clear text password (default hashed to SHA256SALT). If you wish
to use any other hasing algorithm, you would need to write a custom authentication adapter.
Can't be passed when command is executed via integration.api.port",
+            description = "Clear text password (default hashed to SHA256SALT). If you wish
to use any other hashing algorithm, you would need to write a custom authentication adapter.
Can't be passed when command is executed via integration.api.port",
             acceptedOnAdminPort = false)
     private String password;
 
 
-    @Parameter(name = ApiConstants.SECRET_KEY, type = CommandType.STRING, description = "The
secret key for the user. Must be specified with userSecretKey")
+    @Parameter(name = ApiConstants.SECRET_KEY, type = CommandType.STRING, description = "The
secret key for the user. Must be specified with userApiKey")
     private String secretKey;
 
     @Parameter(name = ApiConstants.TIMEZONE,


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

Mime
View raw message