Commit Graph

6 Commits

Author SHA1 Message Date
Salvatore Orlando fbd5edc2e3 Fix conflict resolution errors
Conflicts:

	api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java
2012-04-24 02:20:39 +01:00
Salvatore Orlando 8c398654d3 Open vSwitch tunnel manager
Applying patch with new ovs-tunnel-manager on top of cloudstack oss-master

Conflicts:

	api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java
2012-04-24 02:20:37 +01:00
frank 72d284de7d Switch to Apache license 2012-04-03 04:54:14 -07:00
Frank 92155522f2 Add license header to files 2011-04-14 11:23:14 -07:00
Frank 38ab26bcb0 ovs tunnel network -- add lock entry in ovs_tunnel_account 2011-01-24 13:47:34 -08:00
Frank 276e37115b open vswitch - Implement gre tunnel based network that doesn't use vlan
it allows cross zone communication and no 4096 limitation introduced by vlan
2011-01-21 17:32:02 -08:00