This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.12 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.12 by this push: new 3f2399f server: Fix forward merge missing import causing build failure 3f2399f is described below commit 3f2399f107f25e0bc0240becb64d24467eadbdb5 Author: Rohit Yadav <rohit.ya...@shapeblue.com> AuthorDate: Mon Jun 3 18:55:25 2019 +0530 server: Fix forward merge missing import causing build failure This fixes forward merge regression that missed an import and causes build failure in b2b99ca63eecab6c0be40015ee54c37b55e07bac Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> --- server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index e6ba5e7..5caa059 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -302,7 +302,7 @@ import com.cloud.vm.dao.VMInstanceDao; import com.cloud.vm.snapshot.VMSnapshotManager; import com.cloud.vm.snapshot.VMSnapshotVO; import com.cloud.vm.snapshot.dao.VMSnapshotDao; - +import com.google.common.base.Strings; public class UserVmManagerImpl extends ManagerBase implements UserVmManager, VirtualMachineGuru, UserVmService, Configurable { private static final Logger s_logger = Logger.getLogger(UserVmManagerImpl.class);