opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.6.0 -> master

Browse Source 
* commit '11fc2afc333dc1fea43f2ce27e0a1d2175843a14':
  fix network merge
This commit is contained in:
邱剑
2019-01-17 12:07:08 +08:00
parent a6530ab476 11fc2afc33
commit 360a33d4d1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/networks.go
+1 -1
View File
@@ -1529,7 +1529,7 @@ func (self *SNetwork) PerformMerge(ctx context.Context, userCred mcclient.TokenC
if ipNE.StepUp() == ipSS {
startIp, endIp = net.GuestIpStart, self.GuestIpEnd
} else if ipSE == ipNS {
} else if ipSE.StepUp() == ipNS {
startIp, endIp = self.GuestIpStart, net.GuestIpEnd
} else {
note := "Incontinuity Network for %s and %s"