You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by nv...@apache.org on 2021/09/03 03:06:49 UTC
[cloudstack] branch main updated (4de3542 -> 13d8489)
This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 4de3542 Merge branch '4.15' into main
add a5e7e08 Filter disk / service offerings by domain at DB level (#5307)
new 13d8489 Merge branch '4.15' into main
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../service/dao/ServiceOfferingDetailsDao.java | 4 +-
.../service/dao/ServiceOfferingDetailsDaoImpl.java | 7 +
.../resourcedetail/ResourceDetailsDao.java | 1 +
.../resourcedetail/ResourceDetailsDaoBase.java | 19 +++
.../resourcedetail/dao/DiskOfferingDetailsDao.java | 4 +-
.../dao/DiskOfferingDetailsDaoImpl.java | 10 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 179 ++++++++++-----------
.../api/query/dao/ServiceOfferingJoinDaoImpl.java | 1 -
8 files changed, 126 insertions(+), 99 deletions(-)
[cloudstack] 01/01: Merge branch '4.15' into main
Posted by nv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 13d84894783bd64022a23cd861d4a331f70709a0
Merge: 4de3542 a5e7e08
Author: nicolas <ni...@gmail.com>
AuthorDate: Fri Sep 3 00:06:08 2021 -0300
Merge branch '4.15' into main
.../service/dao/ServiceOfferingDetailsDao.java | 4 +-
.../service/dao/ServiceOfferingDetailsDaoImpl.java | 7 +
.../resourcedetail/ResourceDetailsDao.java | 1 +
.../resourcedetail/ResourceDetailsDaoBase.java | 19 +++
.../resourcedetail/dao/DiskOfferingDetailsDao.java | 4 +-
.../dao/DiskOfferingDetailsDaoImpl.java | 10 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 179 ++++++++++-----------
.../api/query/dao/ServiceOfferingJoinDaoImpl.java | 1 -
8 files changed, 126 insertions(+), 99 deletions(-)
diff --cc server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index a13720f,1d7f530..2041e92
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@@ -117,11 -116,8 +116,10 @@@ import org.apache.cloudstack.framework.
import org.apache.cloudstack.query.QueryService;
import org.apache.cloudstack.resourcedetail.dao.DiskOfferingDetailsDao;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
- import org.apache.commons.collections.CollectionUtils;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;