aaf0d24a83
Merge branch 'vpc-3.0.x' into 3.0.x
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
api/src/com/cloud/api/commands/EnableStaticNatCmd.java
api/src/com/cloud/event/EventTypes.java
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/rules/RulesService.java
client/tomcatconf/commands.properties.in
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java
setup/db/create-schema.sql
wscript
2012-06-14 19:04:59 -07:00
2619492b6e
VPC : use routerProxy to call l2tpVpn
2012-06-06 17:19:52 -07:00
1b81342354
VPC : use routerProxy to call networkUsage.sh
2012-06-06 16:36:47 -07:00
a015a9203e
VCP : use routerProxy to call checkrouter script
2012-06-06 16:08:14 -07:00
98127b0b92
VPC: typo fix
2012-06-06 12:13:43 -07:00
076a876f80
VPC : introduce router_proxy.sh, resource should use this as a proxy to call scripts inside domr
...
already did this for ipassoc and getDomRVersion
2012-06-05 17:26:19 -07:00
072410b4e4
CS-14900:
...
CS-14902: Fixing ovs-vif-flows.py for avoiding it kicks in with exp backoff timeouts if ovs is not running
Also removing unnecessary copies of the same script
2012-05-17 15:59:34 +01:00
af3758eb62
remove another vnc hack
2012-05-08 11:00:56 -07:00
2f9c4d1e39
Adding Missing file to source control
2012-04-24 02:20:38 +01:00
2d12cfbc87
Fixing remaining issues with per-VIF flow script and removing version-specific scripts.
...
Now generating XSnetwork names using gre keys
Plus other minor corrections
Conflicts:
server/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
server/src/com/cloud/resource/ResourceManagerImpl.java
2012-04-24 02:20:38 +01:00
f786505a1b
Adding Missing file to source control
2012-04-24 02:20:37 +01:00
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
72d284de7d
Switch to Apache license
2012-04-03 04:54:14 -07:00
d5935bdc2c
bug 13603: in XenServer 6.0, qemu-dm-wrapper listens on local host by fault
...
status 13603: resolved fixed
reviewed-by: edison
2012-02-22 18:39:06 -08:00
f964c4d227
bug 10363 : cleanup vhd in primary storage if download template to primary storage fails
...
Conflicts:
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
scripts/vm/hypervisor/xenserver/vmops
2012-01-10 13:56:29 -08:00
61eab674d2
bug 12328: XenServer 6.0 changes vnc-port path in xenstore
...
status 12328: resolved fixed
2011-12-21 12:00:27 -08:00
331bd6c103
SWIFT: add error handling code
...
add swift plugin for XenServer 6.0
2011-12-14 19:53:56 -08:00
c152d1c33f
support XenServer 6.0 beta
2011-07-20 16:47:48 -07:00
9f2eaca6cb
Support XenServer 6.0 beta
2011-07-20 16:47:48 -07:00
7a47a5afcf
introduce nfs.py and NFSSR.py from XenServer 6.0 beta
2011-07-20 16:47:48 -07:00
Alena Prokharchyk
anthony
Salvatore Orlando
frank