You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/12/23 12:21:39 UTC
[10/19] git commit: updated refs/heads/4.9 to 20986ba
CLOUDSTACK-9612: Fixed issue in restarting redundant network with cleanup
Rvr Network with cleanup which is updated from the isolated network is failed.
Corrected the column name string issue.
This closes #1781
(cherry picked from commit 0f742e17237fc84d5e86dae9a67c7ef6a0b6c80c)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7d678dfc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7d678dfc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7d678dfc
Branch: refs/heads/4.9
Commit: 7d678dfcaeaae7ea813132fc9a85572321032c3d
Parents: 60c4fce
Author: Jayapalu <Ja...@apache.org>
Authored: Thu Nov 24 16:17:09 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 22 13:12:12 2016 +0530
----------------------------------------------------------------------
engine/schema/src/com/cloud/network/dao/NetworkVO.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d678dfc/engine/schema/src/com/cloud/network/dao/NetworkVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkVO.java b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
index 5b8ded7..ee5c6b5 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
@@ -104,7 +104,7 @@ public class NetworkVO implements Network {
State state;
@Column(name = "redundant")
- boolean isRedundant;
+ boolean redundant;
@Column(name = "dns1")
String dns1;
@@ -205,7 +205,7 @@ public class NetworkVO implements Network {
this.networkOfferingId = networkOfferingId;
this.dataCenterId = dataCenterId;
this.physicalNetworkId = physicalNetworkId;
- this.isRedundant = isRedundant;
+ this.redundant = isRedundant;
if (state == null) {
this.state = State.Allocated;
} else {
@@ -301,7 +301,7 @@ public class NetworkVO implements Network {
@Override
public boolean isRedundant() {
- return this.isRedundant;
+ return this.redundant;
}
// don't use this directly when possible, use Network state machine instead
@@ -632,7 +632,7 @@ public class NetworkVO implements Network {
}
public void setIsReduntant(boolean reduntant) {
- this.isRedundant = reduntant;
+ this.redundant = reduntant;
}
}