cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 25e9918
Date Thu, 09 Jul 2015 11:59:52 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 97ed8c3af -> 25e9918c5


Amend last commit, used 4 spaces in code formatting instead of 1 tab character.

Signed-off-by: wilderrodrigues <wrodrigues@schubergphilis.com>

This closes #560


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

Branch: refs/heads/master
Commit: 25e9918c5791a74bc4840ec6d6bf9e9ece397a68
Parents: 50c4836
Author: weingartner <rafaelweingartner@gmail.com>
Authored: Mon Jul 6 13:14:27 2015 -0300
Committer: wilderrodrigues <wrodrigues@schubergphilis.com>
Committed: Thu Jul 9 13:37:59 2015 +0200

----------------------------------------------------------------------
 .../xenserver/resource/XcpOssResource.java      | 60 ++++++++++----------
 1 file changed, 29 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/25e9918c/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XcpOssResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XcpOssResource.java
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XcpOssResource.java
index 2922a0f..b2f403d 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XcpOssResource.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XcpOssResource.java
@@ -35,38 +35,36 @@ import com.xensource.xenapi.VM;
 @Local(value = ServerResource.class)
 public class XcpOssResource extends CitrixResourceBase {
 
-	private static final long mem_32m = 33554432L;
+    private static final long mem_32m = 33554432L;
 
-	@Override
-	protected List<File> getPatchFiles() {
-		final List<File> files = new ArrayList<File>();
-		final String patch = "scripts/vm/hypervisor/xenserver/xcposs/patch";
-		final String patchfilePath = Script.findScript("", patch);
-		if (patchfilePath == null) {
-			throw new CloudRuntimeException("Unable to find patch file "
-					+ patch);
-		}
-		final File file = new File(patchfilePath);
-		files.add(file);
-		return files;
-	}
+    @Override
+    protected List<File> getPatchFiles() {
+        final List<File> files = new ArrayList<File>();
+        final String patch = "scripts/vm/hypervisor/xenserver/xcposs/patch";
+        final String patchfilePath = Script.findScript("", patch);
+        if (patchfilePath == null) {
+            throw new CloudRuntimeException("Unable to find patch file "
+                    + patch);
+        }
+        final File file = new File(patchfilePath);
+        files.add(file);
+        return files;
+    }
 
-	@Override
-	protected String getGuestOsType(final String stdType,
-			final String platformEmulator, final boolean bootFromCD) {
-		if (stdType.equalsIgnoreCase("Debian GNU/Linux 6(64-bit)")) {
-			return "Debian Squeeze 6.0 (64-bit)";
-		} else if (stdType.equalsIgnoreCase("CentOS 5.6 (64-bit)")) {
-			return "CentOS 5 (64-bit)";
-		} else {
-			return super.getGuestOsType(stdType, platformEmulator, bootFromCD);
-		}
-	}
+    @Override
+    protected String getGuestOsType(final String stdType,
+            final String platformEmulator, final boolean bootFromCD) {
+        if (stdType.equalsIgnoreCase("Debian GNU/Linux 6(64-bit)")) {
+            return "Debian Squeeze 6.0 (64-bit)";
+        } else if (stdType.equalsIgnoreCase("CentOS 5.6 (64-bit)")) {
+            return "CentOS 5 (64-bit)";
+        } else {
+            return super.getGuestOsType(stdType, platformEmulator, bootFromCD);
+        }
+    }
 
-	@Override
-	protected void setMemory(final Connection conn, final VM vm,
-			final long minMemsize, final long maxMemsize)
-			throws XmlRpcException, XenAPIException {
-		vm.setMemoryLimits(conn, mem_32m, maxMemsize, minMemsize, maxMemsize);
-	}
+    @Override
+    protected void setMemory(final Connection conn, final VM vm, long minMemsize, final long
maxMemsize) throws XmlRpcException, XenAPIException {
+        vm.setMemoryLimits(conn, mem_32m, maxMemsize, minMemsize, maxMemsize);
+    }
 }


Mime
View raw message