Skip to content

Commit 8a0e1cb

Browse files
authored
Merge pull request #412 from jschoiRR/mold-diplo
[Mold API] 20240226일자 소스 병합후 빌드 오류 수정
2 parents 87b1e66 + 784f071 commit 8a0e1cb

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

core/src/main/java/com/cloud/resource/ServerResourceBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ protected Answer listRbdFilesAtPath(String poolPath, String keyword) {
188188
List<Boolean> isDirs = new ArrayList<>();
189189
List<Long> sizes = new ArrayList<>();
190190
List<Long> modifiedList = new ArrayList<>();
191-
191+
192192
Script listCommand = new Script("/bin/bash", logger);
193193
listCommand.add("-c");
194194

engine/schema/src/main/java/com/cloud/storage/dao/VolumeDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public interface VolumeDao extends GenericDao<VolumeVO, Long>, StateDao<Volume.S
157157
List<VolumeVO> listByIds(List<Long> ids);
158158

159159
VolumeVO findByPath(String path);
160-
160+
161161
List<VolumeVO> listAllocatedVolumesForAccountDiskOfferingIdsAndNotForVms(long accountId, List<Long> diskOfferingIds, List<Long> vmIds);
162162

163163
}

engine/schema/src/main/java/com/cloud/storage/dao/VolumeDaoImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ public VolumeVO findByPath(String path) {
846846
sc.setParameters("path", path);
847847
return findOneBy(sc);
848848
}
849-
849+
850850
public List<VolumeVO> listAllocatedVolumesForAccountDiskOfferingIdsAndNotForVms(long accountId, List<Long> diskOfferingIds, List<Long> vmIds) {
851851
SearchBuilder<VolumeVO> sb = createSearchBuilder();
852852
sb.and("account", sb.entity().getAccountId(), SearchCriteria.Op.EQ);

0 commit comments

Comments
 (0)