Resolving merge conflicts

Dingane Hlaluku · Dingane Hlaluku · commit bea5c05d3f79 · 2018-07-24T16:17:59.000+02:00
diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -725,6 +725,8 @@ public class ApiConstants {
     public static final String EXITCODE = "exitcode";
     public static final String TARGET_ID = "targetid";
 
+    public static final String EXTRA_CONFIG = "extraconfig";
+
     public enum HostDetails {
         all, capacity, events, stats, min;
     }
diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1106,7 +1106,7 @@ public void orchestrateStart(final String vmUuid, final Map<VirtualMachineProfil
 
                     final VirtualMachineTO vmTO = hvGuru.implement(vmProfile);
 
-                    UserVmDetailVO detailVO = _uservmDetailsDao.findDetail(vm.getId(), "extraConfig");
+                    UserVmDetailVO detailVO = userVmDetailsDao.findDetail(vm.getId(), "extraConfig");
 
                     if (detailVO != null) {
                         vmTO.setEnableExtraConfig(true);

Original file line number	Diff line number	Diff line change
`@@ -725,6 +725,8 @@ public class ApiConstants {`
`725`	`725`	`public static final String EXITCODE = "exitcode";`
`726`	`726`	`public static final String TARGET_ID = "targetid";`
`727`	`727`
	`728`	`+ public static final String EXTRA_CONFIG = "extraconfig";`
	`729`	`+`
`728`	`730`	`public enum HostDetails {`
`729`	`731`	`all, capacity, events, stats, min;`
`730`	`732`	`}`