cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [16/50] [abbrv] git commit: updated refs/heads/marvin_refactor to 284581f
Date Tue, 16 Apr 2013 16:40:22 GMT
Fix merge issues with remoteAccessVPNResponse, and server

Duplicated methods creep in from bad merge

Signed-off-by: Prasanna Santhanam <tsp@apache.org>

squ


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

Branch: refs/heads/marvin_refactor
Commit: 3bf8c118d82c4e8ecdb983aeb569b45f2e60dd04
Parents: db2593f
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Mon Apr 15 12:04:33 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Mon Apr 15 12:27:06 2013 +0530

----------------------------------------------------------------------
 .../api/response/RemoteAccessVpnResponse.java      |    8 -------
 .../src/com/cloud/server/ManagementServerImpl.java |   16 ---------------
 2 files changed, 0 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3bf8c118/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java b/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
index e8d7eb4..2cbb3ca 100644
--- a/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
@@ -61,9 +61,6 @@ public class RemoteAccessVpnResponse extends BaseResponse implements ControlledE
     @SerializedName(ApiConstants.ID) @Param(description="the id of the remote access vpn")
     private String id;
 
-    @SerializedName(ApiConstants.ID) @Param(description="the id of the remote access vpn")
-    private String id;
-
     public void setPublicIp(String publicIp) {
         this.publicIp = publicIp;
     }
@@ -110,9 +107,4 @@ public class RemoteAccessVpnResponse extends BaseResponse implements ControlledE
     public void setId(String id) {
         this.id = id;
     }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3bf8c118/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 608f72a..d9a4317 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -430,22 +430,6 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
 		this._hostAllocators = _hostAllocators;
 	}
 
-    public List<UserAuthenticator> getUserAuthenticators() {
-	return _userAuthenticators;
-    }
-
-    public void setUserAuthenticators(List<UserAuthenticator> authenticators) {
-	_userAuthenticators = authenticators;
-    }
-
-    public List<HostAllocator> getHostAllocators() {
-		return _hostAllocators;
-	}
-
-	public void setHostAllocators(List<HostAllocator> _hostAllocators) {
-		this._hostAllocators = _hostAllocators;
-	}
-
 	@Override
 	public boolean configure(String name, Map<String, Object> params)
 			throws ConfigurationException {


Mime
View raw message