cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelv...@apache.org
Subject git commit: updated refs/heads/4.2 to 7acb023
Date Thu, 01 Aug 2013 01:09:20 GMT
Updated Branches:
  refs/heads/4.2 a747ee508 -> 7acb023aa


More fixes found in test cases when JVM assertion check is turned on


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7acb023a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7acb023a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7acb023a

Branch: refs/heads/4.2
Commit: 7acb023aad5a2343b6ed0953c19f4c49bfc293df
Parents: a747ee5
Author: Kelven Yang <kelveny@gmail.com>
Authored: Wed Jul 31 17:58:15 2013 -0700
Committer: Kelven Yang <kelveny@gmail.com>
Committed: Wed Jul 31 17:58:31 2013 -0700

----------------------------------------------------------------------
 engine/schema/src/com/cloud/host/dao/HostDaoImpl.java | 2 +-
 engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7acb023a/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java b/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
index dd26941..e22274e 100755
--- a/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
+++ b/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
@@ -392,7 +392,7 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements
HostDao
     @Override
     public List<HostVO> listByDataCenterId(long id) {
         SearchCriteria<HostVO> sc = DcSearch.create();
-        sc.setParameters("dcId", id);
+        sc.setParameters("dc", id);
         sc.setParameters("status", Status.Up);
         sc.setParameters("type", Host.Type.Routing);
         sc.setParameters("resourceState", ResourceState.Enabled);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7acb023a/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java
index d6433a4..2868b4f 100644
--- a/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java
+++ b/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java
@@ -54,6 +54,7 @@ public class NicDaoImpl extends GenericDaoBase<NicVO, Long> implements
NicDao {
         AllFieldsSearch.and("broadcastUri", AllFieldsSearch.entity().getBroadcastUri(), Op.EQ);
         AllFieldsSearch.and("secondaryip", AllFieldsSearch.entity().getSecondaryIp(), Op.EQ);
         AllFieldsSearch.and("nicid", AllFieldsSearch.entity().getId(), Op.EQ);
+        AllFieldsSearch.and("strategy", AllFieldsSearch.entity().getReservationStrategy(),
Op.EQ);
         AllFieldsSearch.done();
 
         IpSearch = createSearchBuilder(String.class);


Mime
View raw message