Repository: cloudstack
Updated Branches:
refs/heads/4.3 0810029f2 -> 7830a0f0f
CLOUDSTACK-6299: Fixed apidoc info with base64 encoded
Conflicts:
api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7830a0f0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7830a0f0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7830a0f0
Branch: refs/heads/4.3
Commit: 7830a0f0f494353685fb6ebdbb44c6d2423353db
Parents: 0810029
Author: Sebastien Goasguen <[email protected]>
Authored: Fri Mar 28 09:51:45 2014 -0400
Committer: Sebastien Goasguen <[email protected]>
Committed: Fri Mar 28 09:55:38 2014 -0400
----------------------------------------------------------------------
.../org/apache/cloudstack/api/response/GetVMPasswordResponse.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7830a0f0/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java
----------------------------------------------------------------------
diff --git
a/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java
b/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java
index 56ced5b..3bcde21 100644
--- a/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java
@@ -23,7 +23,8 @@ import com.google.gson.annotations.SerializedName;
public class GetVMPasswordResponse extends BaseResponse {
- @SerializedName("encryptedpassword") @Param(description="The encrypted
password of the VM")
+ @SerializedName("encryptedpassword")
+ @Param(description = "The base64 encoded encrypted password of the VM")
private String encryptedPassword;
public GetVMPasswordResponse() {}
