etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix conflict resolution errors 

Conflicts:

	api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java
This commit is contained in:
Salvatore Orlando 2012-04-23 01:51:44 +01:00
parent 421862216e
commit fbd5edc2e3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java
View File

@ -24,7 +24,7 @@ public class OvsCreateTunnelAnswer extends Answer {
//for debug info
String fromIp;
String toIp;
String key;
int key;
String bridge;
public OvsCreateTunnelAnswer(Command cmd, boolean success, String details, String bridge) {
@ -70,7 +70,7 @@ public class OvsCreateTunnelAnswer extends Answer {
return toIp;
}
public String getKey() {
public int getKey() {
return key;
}
@ -79,4 +79,3 @@ public class OvsCreateTunnelAnswer extends Answer {
}
}
>>>>>>> 9f321ff... Open vSwitch tunnel manager

1
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -656,6 +656,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
private synchronized Network configureTunnelNetwork(Connection conn, long networkId, long hostId, int key) {
try {
Network nw = findOrCreateTunnelNetwork(conn, networkId);
String nwName = "OVSTunnel" + key;
//Invoke plugin to setup the bridge which will be used by this network
String bridge = nw.getBridge(conn);
Map<String,String> nwOtherConfig = nw.getOtherConfig(conn);