Edison Su
764678f558
CS-15521 Xenserver based User VM failed to HA when vrouter runs on ESXi
...
return false as an answer when executing PingTestCommand in
VMwareResource
RB:https://reviews.apache.org/r/5903/
Send-by: mice_xia@tcloudcomputing.com
2012-07-26 10:43:33 -07:00
Alena Prokharchyk
6420ecbd6f
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-24 16:13:06 -07:00
Edison Su
576d093e9c
fix CS-15432 Failed to detach VMware tools ISO after VMware tools
...
installation
RB: https://reviews.apache.org/r/5738/
Send-by: mice_xia@tcloudcomputing.com
2012-07-24 13:44:55 -07:00
Sheng Yang
f1e2be7157
CS-15511: Fix parameter transfer in bash
...
[Dropped Vmware support in this commit, due to lack of VMware support in VPC now]
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
2012-07-23 14:51:40 -07:00
Alena Prokharchyk
a1acfd3bfa
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/network/Network.java
client/tomcatconf/components.xml.in
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/guru/GuestNetworkGuru.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
setup/db/create-schema.sql
2012-07-13 13:52:58 -07:00
Hugo Trippaers
79c7da07ab
Phase 1 of Nicira integration
2012-07-11 17:16:06 -07:00
Alena Prokharchyk
353423acec
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
api/src/com/cloud/api/response/FirewallResponse.java
api/src/com/cloud/api/response/IPAddressResponse.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/dao/NetworkDaoImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-06 12:04:10 -07:00
Edison Su
27e9cdbece
add console proxy support for devcloud
2012-07-03 23:38:39 -07:00
Alena Prokharchyk
31f9d718fb
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
Vijayendra Bhamidipati
b957933a0e
Making nexus vsm password encryptable
2012-07-03 17:26:05 -07:00
Sheng Yang
8d4079d477
CS-6840: Add hypervisor commands for site-to-site vpn
...
Conflicts:
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
2012-07-02 16:28:44 -07:00
David Nalley
9aa0edf7a4
License header updates for the ovm folder from Chip Childers
...
https://reviews.apache.org/r/5706/
2012-07-02 09:52:55 -04:00
Alena Prokharchyk
1f01d923ca
Merge branch 'master' into vpc
2012-06-28 17:44:08 -07:00
Edison Su
5f6387e113
add clouddev
2012-06-27 23:28:34 -07:00
Murali reddy
8197f1f07c
moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware
2012-06-26 19:48:55 -07:00
Murali reddy
550b22576f
Moving out XenServer support code into plugins/hypervisors/xen
2012-06-26 16:42:31 -07:00
frank
a2d49bef69
Change OVM script deploy target in line with Alex re-packaging change
...
fix RPM build, don't install cloud-console-proxy.jar as there is not such package anymore
2012-06-20 10:45:56 -07:00
Alex Huang
e2a32ab4f7
Introduced plugins directory.
...
Moved ovm into plugins.
Introduced build.xml for ovm.
2012-06-19 18:27:09 -07:00
