You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2014/03/28 01:39:34 UTC
[25/28] git commit: updated refs/heads/4.4 to 392dc81
CLOUDSTACK-5329: stupid java box/unbox
Conflicts:
engine/schema/src/com/cloud/vm/VMInstanceVO.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/11d11d86
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/11d11d86
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/11d11d86
Branch: refs/heads/4.4
Commit: 11d11d86905f4020e533b8b18e790fa61383a26d
Parents: 6b364f9
Author: Edison Su <su...@gmail.com>
Authored: Thu Mar 27 16:11:51 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:41 2014 -0700
----------------------------------------------------------------------
engine/schema/src/com/cloud/vm/VMInstanceVO.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11d11d86/engine/schema/src/com/cloud/vm/VMInstanceVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/VMInstanceVO.java b/engine/schema/src/com/cloud/vm/VMInstanceVO.java
index 376b835..3d4337f 100644
--- a/engine/schema/src/com/cloud/vm/VMInstanceVO.java
+++ b/engine/schema/src/com/cloud/vm/VMInstanceVO.java
@@ -417,8 +417,8 @@ public class VMInstanceVO implements VirtualMachine, FiniteStateObject<State, Vi
return podIdToDeployIn;
}
- public void setPodId(long podId) {
- podIdToDeployIn = podId;
+ public void setPodId(Long podId) {
+ this.podIdToDeployIn = podId;
}
public void setPrivateMacAddress(String privateMacAddress) {