cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [14/50] [abbrv] git commit: updated refs/heads/ui-restyle to 326b3a6
Date Tue, 10 Dec 2013 23:51:54 GMT
fix staticNat after rebase


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

Branch: refs/heads/ui-restyle
Commit: 7efab20300eec38d391f1a3135c0c50dcd035dc8
Parents: 4d06021
Author: tuna <ng.tuna@gmail.com>
Authored: Mon Nov 4 15:53:43 2013 +0700
Committer: tuna <ng.tuna@gmail.com>
Committed: Mon Dec 9 23:33:15 2013 +0700

----------------------------------------------------------------------
 engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java  | 2 +-
 .../ovs/src/com/cloud/network/element/OvsElement.java            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7efab203/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java b/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java
index b00d5c1..2026ccf 100644
--- a/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java
@@ -14,7 +14,7 @@ import com.cloud.utils.db.SearchCriteria;
 
 @Component
 @Local(value = OvsProviderDao.class)
-@DB(txn = false)
+@DB()
 public class OvsProviderDaoImpl extends GenericDaoBase<OvsProviderVO, Long>
 		implements OvsProviderDao {
 	final SearchBuilder<OvsProviderVO> AllFieldsSearch;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7efab203/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java b/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
index 2b625a9..2641d54 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
@@ -407,8 +407,8 @@ public class OvsElement extends AdapterBase implements NetworkElement,
 			throws ResourceUnavailableException {
 		boolean canHandle = true;
 		for (Service service : services) {
-			// check if Ovs can handle services except SourceNat
-			if (!canHandle(network, service) && service != Service.SourceNat) {
+			// check if Ovs can handle services except SourceNat & Firewall
+			if (!canHandle(network, service) && service != Service.SourceNat && service
!= Service.Firewall) {
 				canHandle = false;
 				break;
 			}


Mime
View raw message