Rohit Yadav
9de4abeb49
schema: add upgrade path stubs from 4.4.0 to 4.4.1
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-07-28 23:52:47 +02:00
Sanjay Tripathi
3d62fbc6e5
CLOUDSTACK-7029: listCapacity fails when podid argument is specified.
...
(cherry picked from commit ef2cf137a5 )
2014-07-28 16:02:51 +02:00
Santhosh Edukulla
2eae404cf7
Fixed failing DatabaseAccessObject unit test cases
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit ff46258022 )
2014-07-28 16:02:43 +02:00
Santhosh Edukulla
eb16a4e9e3
Fixed Resource Leaks
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit c690320f0b )
2014-07-28 16:02:42 +02:00
Alena Prokharchyk
15ffec2632
CLOUDSTACK-6934: don't try to detach volume from host when volume was never allocated to a primary storage
...
(cherry picked from commit 92fea032da )
2014-07-28 16:02:40 +02:00
Koushik Das
aa9f518613
CLOUDSTACK-6740: Direct agent command throttling improvements
...
List of changes:
1. Created a separate thread pool for handling cron and ping tasks. The size of the pool is based on direct.agent.pool.size. The existing direct agent pool will run all commands other than cron and ping.
2. For normal tasks (generated as part of user/admin API calls), if throttle limit is reached then tasks get queued up for subsequent execution once threads are available.
3. For cron and ping tasks (internally generated by MS like ping, VM sync etc.), if throttle limit is reached then these gets rejected. Since these are internally generated these can be rejected without any issues.
(cherry picked from commit 120da605b0 )
2014-07-28 16:02:17 +02:00
Nitin Mehta
5c9ca6c22d
CLOUDSTACK-6699: listResouceDetails - enhance it to list by (key,value) pair - allowed to Admin only.
...
(cherry picked from commit d5425e1a4a )
2014-07-28 16:02:13 +02:00
Koushik Das
fb20b71255
CLOUDSTACK-6579: used_bytes column of storage_pool table is no longer used and should be removed
...
For now correctly setting used_bytes. Also fixed the corresponding simulator code
(cherry picked from commit 64ccf4b48e )
2014-07-28 16:02:05 +02:00
Daan Hoogland
c9383c441e
Updating pom.xml version numbers for release 4.4.1-SNAPSHOT
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-07-23 16:55:31 +02:00
Daan Hoogland
80f2694443
Revert "CLOUDSTACK-6935 refactor StoragePoolAllocator#filter logic"
...
This reverts commit 99dd86e588 .
2014-06-27 17:45:35 +02:00
Anshul Gangwar
af37ade9e3
CLOUDSTACK-6830: Fixed [hyper-v] during VM migration, volumes on zone wide primary
...
store requires storage migration resulting in failure of VM migration. This also
improves the hostsformigration api. Firstly we were trying to list all hosts and
then finding suitable storage pools for all volumes and then we were checking
whether vm migration requires storage migration to that host. Now the process is
updated. We are checking for only those volumes which are not in zone wide primary
store. We are verifying by comparing volumes->poolid->clusterid to host clusterid.
If it uses local or clusterids are different then verifying whether host has
suitable storage pools for the volume of the vm to be migrated too.
(cherry picked from commit 64153a4371 )
Conflicts:
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
2014-06-23 09:56:17 +02:00
Anshul Gangwar
423c23af40
CLOUDSTACK-6965: fixed the NullPointerException introduced by fix for cloudstack
...
6935 in AbstractStoragePoolAllocator#filter method for Zone Wide storage
(cherry picked from commit ef45f06f88 )
2014-06-23 09:50:04 +02:00
ynojima
99dd86e588
CLOUDSTACK-6935 refactor StoragePoolAllocator#filter logic
...
to support IOPS capacity control in a cluster wide storage pool and a
local storage pool
to enable hypervisor type check, storage type check for root volume and
avoid list check
Since original commit(31de58edab ) contained
a bug, it was reverted and this commit is a revised one.
(cherry picked from commit 45f0c73676 )
2014-06-19 09:41:47 +02:00
Santhosh Edukulla
61cf175f1c
Coverity issues: Fixed conflicts
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-06-17 13:49:55 +02:00
Santhosh Edukulla
ade82be393
Fixed few resource leak issues
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 3c5f64c97a )
2014-06-16 17:16:28 +02:00
Anshul Gangwar
a951b51523
CLOUDSTACK-6865 , CLOUDSTACK-6868: [hyperv] while attaching the volume we were changing the volume's Image format to hypervisor's default Image format, hence it was failing to find the volume with vhdx format. Now changed the behavior to set Image Format for volume only when it is not set
...
(cherry picked from commit ebff469b46 )
2014-06-13 12:41:18 +02:00
Anshul Gangwar
117c8fe5b0
CLOUDSTACK-6897: when we try to attach the uploaded/allocated volume to a VM on zwps, then we were passing the podId of VM instead of storage pool to storage allocator. This resulting in use of Clusterscope storage allocator, allocating a storage pool for VM on zwps beacuse of pod id not null. This was resulting in scope conflict later
...
(cherry picked from commit 2dc9e2c530 )
2014-06-13 12:38:14 +02:00
Santhosh Edukulla
87c3d77518
Fixed coverity issues
...
(cherry picked from commit 4ba3aae2ea )
2014-06-12 14:44:26 +02:00
Olivier Lemasle
c934e7b052
CLOUDSTACK-6850: Return cpu cores, cpu speed and memory in listUsageRecords
...
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit a1f278e9d4 )
2014-06-10 13:39:43 +02:00
amoghvk
b490da25ba
CLOUDSTACK-6358: Remove hardcoded VMware mappings, handle snapshots
...
(cherry picked from commit a4b401f29f )
2014-06-10 13:18:56 +02:00
Daan Hoogland
beaa65f777
try-with-resource to prevent resource leaks
...
(cherry picked from commit 39f775c381 )
2014-06-06 19:28:21 +02:00
sedukull
6c0b43431f
CLOUDSTACK-6793: Fixed an invalid Domain Id Issue
...
Signed-off-by: sedukull <santhosh.edukulla@gmail.com>
(cherry picked from commit 91d054cb00 )
2014-06-06 15:54:45 +02:00
Alena Prokharchyk
e6c37ffd41
CLOUDSTACK-6853: Search for non-removed nics only when check if the running vm belongs to a certain network
...
(cherry picked from commit 03623fe57e )
2014-06-06 13:42:12 +02:00
Alena Prokharchyk
11d8c953e3
CLOUDSTACK-6676: cleanup ip address details on ip disassoc
...
(cherry picked from commit 66df43572e )
2014-06-06 13:41:23 +02:00
Rajesh Battala
073928fef5
CLOUDSTACK-6831 [Hyper-V] Improve the logging for VM snapshot failures as it is not supported. Right now it is throwing NPEs
...
(cherry picked from commit d59cc1ff8f )
2014-06-05 14:36:17 +02:00
Rajani Karuturi
004e0cbf61
Fixed ResouceLeak on pstmtCidr in the function Upgrade430to440.moveCidrsToTheirOwnTable as reported by coverity
...
Fixed another leak which might occur due to outer while loop.
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-06-03 15:38:16 +02:00
Nitin Mehta
9fd0655adb
CLOUDSTACK-6599: Add the column in Java upgrade path since 4.2 already has the extract template/volume columns
...
Conflicts:
engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
2014-06-03 10:04:52 +02:00
Nitin Mehta
9286417f05
CLOUDSTACK-6599:
...
1. Adding the missing Template/Volume URLs expiration functionality
2. Improvement - While deleting the volume during expiration use rm -rf as vmware now contains directoy
3. Improvement - Use standard Answer so that the error gets logged in case deletion of expiration link didnt work fine.
4. Improvement - In case of domain change, expire the old urls
(cherry picked from commit 48ea9e0b5e )
2014-06-03 10:02:06 +02:00
Rajani Karuturi
b941b1882c
Fixed ResouceLeak on pstmtCidr in the function Upgrade430to440.moveCidrsToTheirOwnTable as reported by coverity
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-06-03 09:21:50 +02:00
Daan Hoogland
e249038ee5
update vlan uris
2014-06-02 15:53:18 +02:00
Devdeep Singh
3b642c7578
CLOUDSTACK-6810: Fix storage migration of a vm with volume on local was failing. When a plan
...
with hostid included was passed to the local storage pool allocator, it returned all the local
storage pools in the cluster, instead of just the local pool on the given host in the plan.
This was happening the search at a host level was happening only for data disk. Fixed this.
Additionally, the query to list the storage pools on a host was failing if the pool did have
tags. Fixed the query too.
CLOUDSTACK-6802: Fix for not being able to attach data disk on local. This issue gets fixed
with the above issue too. The query to list pools on a host was failing if there were no
tags on the storage pool.
2014-05-30 19:03:21 +02:00
Rajani Karuturi
032be54fc6
FIXED CLOUDSTACK-6781 [Automation] integration.smoke.test_portable_publicip.TestPortablePublicIPRange.test_createPortablePublicIPRange failing on 4.4
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-05-28 10:11:47 +02:00
Rajani Karuturi
df42ce903d
Fixed CLOUDSTACK-6756: usage id is not being returned for an ip in deleted ip range
2014-05-27 10:37:55 +02:00
Min Chen
6ba541afb7
Disable IAM feature from 4.4 release.
...
Conflicts:
test/integration/smoke/test_vm_iam.py
2014-05-21 13:49:11 +02:00
Prachi Damle
0b99822262
CLOUDSTACK-6476: Basic Zone with Multiple Pods Setup: DHCP server doesnt get deployed in the pod where the VM gets deployed
...
Changes:
PodId in which the router should get started was not being saved to the DB due to the VO's setter method not following the setXXX format. So when planner loaded the router from DB, it always got podId as null and that would allow planner to deploy the router in any pod. If the router happens to start in a different pod than the user VM, the Vm fails to start since the Dhcp service check fails.
Fixed the VO's setPodId method, that was causing the DB save operation fail.
2014-05-17 11:25:02 +02:00
Murali Reddy
99dc7e009c
CLOUDSTACK-6686:NetworkACLItemCidrsDaoImpl uses firewallRuleId instead
...
of networkAclItemId
fix uses networkAclItemId instead of firewallRuleId
2014-05-16 22:54:20 +02:00
Sanjay Tripathi
13ba59c5f0
CLOUDSTACK-6649: CS is not giving the system-wide capacity for GPU reosurce.
2014-05-14 13:52:46 +02:00
Amogh Vasekar
a7bf66b9f0
This patch disallows deleting / modifying system defined guest OS mappings
...
Local env
1. Create user defined mapping
2. Delete / modify user defined mapping. Should pass
3. Delete / modify system defined mapping. Should fail
Signed off by :- Nitin Mehta<nitin.mehta@citrix.com>
2014-05-13 22:55:14 +02:00
Devdeep Singh
820f8724fa
CLOUDSTACK-6622: After a volume was live migrated, the destination smb storage path was added to
...
the folder column. For an smb share the smb credentials are in the query string of the path.
Before adding the path, smb shares query string should be cleaned up.
2014-05-13 10:52:35 +02:00
Devdeep Singh
f0dcf474f2
CLOUDSTACK-6510: Fix gson serialization exception in storage migration. Gson couldn't serialize
...
a map with volume and storagepool objects for logging. Fixed by using volume and storage pool
ids instead of objects in the map.
2014-05-13 10:51:42 +02:00
Amogh Vasekar
02bd3d0671
CLOUDSTACK-6358: As a part of supporting dynamic guest OS defined by user, removing the hard-coded dependencies.
...
This patch is for KVM
1. Local testing on KVM
2. Successfully got up system VMs
3. Successfully created a CentOS VM
4. Snapshots are not supported for KVM
Signed off by :- Nitin Mehta<nitin.mehta@citrix.com>
2014-05-13 10:33:15 +02:00
Amogh Vasekar
1fb358d004
CLOUDSTACK-6358: As a part of supporting dynamic guest OS defined by user, removing the hard-coded dependencies.
...
This patch is for XenServer.
1. Local testing on XenServer 6.0.2
2. Successfully got up system VMs
3. Successfully created a CentOS VM
4. Created VM snapshot and reverted to snapshot
5. Manipulated guest_os_hypervisor table for mapping, and checked for correct propagation of platform emulator.
Signed off by :- Nitin Mehta<nitin.mehta@citrix.com>
2014-05-13 10:32:41 +02:00
Saksham Srivastava
3943e0ba1c
CLOUDSTACK-6575: Deploy VM failed with NPE while using custom compute offering
2014-05-11 11:30:33 +02:00
Daan Hoogland
a2d8f6c9cb
be able to remove vpc as owning entity of a network
2014-05-09 17:16:16 +02:00
Alena Prokharchyk
a3825f126f
CLOUDSTACK-6596: UUID and display flag update support for LBStickinessPolicy and LBHealthCheckPolicy
2014-05-08 09:48:27 +02:00
Jayapal
5a84654d15
CLOUDSTACK-6582 updated the table network_acl_item_cidrs name in Upgrade430to440
2014-05-07 09:22:35 +02:00
Alena Prokharchyk
8985b8badc
CLOUDSTACK-6585: added missing metadata support for LBStickiness/LBHealthcheck policies
2014-05-07 09:20:16 +02:00
Jayapal
980eac607f
CLOUDSTACK-6582: fixed network acl cidr issues
2014-05-06 22:39:07 +02:00
Daan Hoogland
94415b80eb
CLOUDSTACK-6582: cidr field removed
2014-05-06 22:38:53 +02:00
Harikrishna Patnala
a521c02c54
CLOUDSTACK-5976: Typo in "ssh_keypairs" table's foreign key constraints
...
on the Upgraded Setup
2014-05-05 20:34:20 +02:00
Bharat Kumar
aabde469d2
Cloudstack-5077: reserve cpu and memory only when vmware.reserve.cpu/mem are set to true. Insted of setting the ovecommit values to one on upgrade, we popultate them from the global values.
...
Conflicts:
engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
2014-05-05 14:06:09 +02:00
Daan Hoogland
ce56894d37
CLOUDSTACK-6549: ommission due to insufficient tests in CLOUDSTACK-6231
2014-05-01 09:43:43 +02:00
Daan Hoogland
2239eb4b17
CLOUDSTACK-6231: network acl item cidrs loaded from a seperate table
2014-04-30 14:56:16 +02:00
Min Chen
65bdf2c9ca
CLOUDSTACK-6478: Failed to download Template when having 3 SSVM's in one
...
zone on Vmware.
2014-04-25 21:26:27 +02:00
Alena Prokharchyk
dceaa7ccef
Revert "Return isolation methods as a part of listPhysicalNetworks call"
...
This reverts commit eb877a093c .
2014-04-22 18:06:33 -07:00
Alena Prokharchyk
eb877a093c
Return isolation methods as a part of listPhysicalNetworks call
2014-04-22 14:46:34 -07:00
Amogh Vasekar
3419c812ae
CLOUDSTACK-6437:
...
Add ability to distinguish between user defined and system defined guest OS and mappings
Add default mappings for XenServer
Local testing with
1. Add new guest OS by API
2. Add new guest OS mapping by API
2014-04-18 11:33:42 -07:00
Harikrishna Patnala
bc9737ec8a
CLOUDSTACK-6211: Xenserver - HA - SSVM fails to start due to running out of management Ip ranges when testing host down scenarios
...
Signed-off-by: Koushik Das <koushik@apache.org>
2014-04-18 17:43:49 +05:30
Saksham Srivastava
406c289d15
CLOUDSTACK-6151: Local data disk with tag goes to the wrong local storage pool
...
Signed-off-by: Koushik Das <koushik@apache.org>
2014-04-16 16:20:04 +05:30
Koushik Das
800e9dbac5
CLOUDSTACK-6402: Fix StopCommand so that VMs are not removed accidentally as part of vmsync
...
Added a new flag 'checkBeforeCleanup' to StopCommand based on which check is done to see if VM is running in HV host.
If VM is running then in this case it is not stopped and the operation bails out.
Also modified the MS code to call the StopCommand with appropriate value for the flag based on the context.
Currently it is only set to 'true' when called from the new vmsync logic based on powerstate of VM. For rest it
is set to 'false' meaning no change in behaviour.
2014-04-14 16:12:35 +05:30
Sanjay Tripathi
127196e95d
CLOUDSTACK-6366: add vgpuTypes details in vgpu_types table.
2014-04-09 18:22:06 +05:30
Harikrishna Patnala
68c80e28c0
CLOUDSTACK-6253: Optimizing VR alerts getting algorithm In addition to this a new configuration parameter is added router.alerts.check.interval defaulted to 30minutes to check for alerts in Virtual Router
2014-04-09 18:11:24 +05:30
Koushik Das
e0a2fcabcc
CLOUDSTACK-6362: Parallel VM deployment - direct.agent.thread.cap needs to default to 1.0 (currently 0.1) to allow for parallel Vm deployments.
2014-04-09 11:41:43 +05:30
Sanjay Tripathi
156fb7ebd3
CLOUDSTACK-6357: Not able to select GPU card in case of GPU-passthrough.
2014-04-08 22:08:17 +05:30
Sanjay Tripathi
ce966c8b38
CLOUDSTACK-6345: Non gpu enabled VMs are getting deployed in gpu enabled Hosts.
2014-04-07 16:05:58 +05:30
Jayapal
936de7e1c5
CLOUDSTACK-6327: Updated the removeFromLoadBalancerRule and listLoadBalancerRuleInstances API
...
Updated these APIs to use VM primary/secondary details on LB rule.
listLoadBalancerRuleInstances API lists the vm ips which are assigned to lb rule when passed
listlbvmips
removeFromLoadBalancerRule is updated to remove the spcific vm ip entry assinged to LB rule.
Added new param vmidipmap to this API
2014-04-04 18:32:43 +05:30
Prachi Damle
8a46539bc4
CLOUDSTACK-6329 [Automation] Changing service offering of VM from medium to small failing with NPE
...
- The hostAllocators were not getting set
2014-04-03 23:07:13 -07:00
Prachi Damle
8ddf0a42b7
CLOUDSTACK-6330 [Automation] createRemoteAccessVpn call fails with access permission error
...
- Correcting the EntityType for PublicIpAddress entity
- Adding the EntityType in the @APICommand for *IPAddrCmds
2014-04-03 23:07:10 -07:00
Kelven Yang
eb41250a48
Do app-level iteration to avoid mysql deadlocks
2014-04-02 16:01:34 -07:00
Anshul Gangwar
90117f09e8
CLOUDSTACK-6288: Changing default ImageFormat to vhdx for hyper-v and allowing registration of vhdx format templates.
...
Signed-off-by: Devdeep Singh <devdeep@gmail.com>
2014-04-01 13:40:21 +05:30
Mike Tutkowski
fe0c9768cf
CLOUDSTACK-6170 (VMware root-disk support for managed storage)
2014-03-31 00:10:49 -06:00
Edison Su
392dc817af
fix build
2014-03-27 17:38:42 -07:00
Edison Su
11d11d8690
CLOUDSTACK-5329: stupid java box/unbox
...
Conflicts:
engine/schema/src/com/cloud/vm/VMInstanceVO.java
2014-03-27 17:38:41 -07:00
Edison Su
73f383c5ab
CLOUDSTACK-5432:sync vm and storage commands on mgt server for kvm
...
Conflicts:
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
server/src/com/cloud/hypervisor/KVMGuru.java
2014-03-27 17:38:40 -07:00
Edison Su
810e090ad4
CLOUDSTACK-5395: mark snapshot_store_ref as destroyed in case of backup snapshot failed
...
Conflicts:
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
2014-03-27 17:38:37 -07:00
Alex Huang
4807bc8bda
Added a config to enable checking whether a db transaction is wrapped around communications with the agent. If it is, an exception is thrown. This assert has actually been there because it is part of CloudStack's design principle to not use db transactions as a way to enforce atomicity in executing things on hardware resources. However, the assert has been ignored since the move to maven which is not good with enabling asserts. Since then, there's been a lot of commands added that actually runs within db transaction. This is a big no no as the problem is that the remote operation may take a long time and the db can actually close the connection, causing a rollback of the transaction. We should not depend on transactions to enforce the atomicity anyways.
2014-03-26 13:35:31 -07:00
Daan Hoogland
15aa618f56
checkstyle: unused import removed
2014-03-26 15:37:54 +01:00
Daan Hoogland
59f1795c9b
checkstyle: trailing whitespace
2014-03-26 15:29:42 +01:00
edison
7db6ba0c5f
CLOUDSTACK-5432: potential bugs in case of stop mgt server while
...
template is downloading, template_store_ref has leftover not in ready
state, when create vm from that template, the code doesn't check either
zone id, nor template_store_ref state.
Conflicts:
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
2014-03-26 14:55:21 +01:00
Anthony Xu
31d22c1b16
use correct interval for cleanTask and transitionTask
2014-03-25 12:05:31 -07:00
Prachi Damle
a5b9814f7a
Fixes to ensure Network entity checkAccess invokes the IAM service
2014-03-24 17:09:43 -07:00
Anthony Xu
7b19b6cc19
vm meta sync sync xstoolsversion as well
2014-03-24 15:49:15 -07:00
Mike Tutkowski
bd6f0db31a
CLOUDSTACK-6170 (Fixed an issue where custom compute offering and custom storage IOPS were leading to custom storage IOPS that were specified not being used)
2014-03-22 00:41:25 -06:00
Mike Tutkowski
8e513e8659
CLOUDSTACK-6170
2014-03-20 20:37:27 -06:00
Min Chen
dcfe77845c
Revert "CLOUDSTACK-6170"
...
This reverts commit 7a7d9cff0d .
2014-03-20 16:28:47 -07:00
Mike Tutkowski
7a7d9cff0d
CLOUDSTACK-6170
2014-03-20 14:13:48 -06:00
Chris Suich
e06d84e06e
Revert "Issue CS-5825 Part Resolution"
...
This reverts commit 9e72d89ac1 which was breaking the build.
2014-03-20 15:46:14 -04:00
Alex Hitchins
9e72d89ac1
Issue CS-5825 Part Resolution
2014-03-20 13:34:35 -04:00
Murali Reddy
e0c1bf7107
persist fact that network can span multiple zones, if network offering
...
has strechedL2Subnet capability and return the zones in which network
spans in the networkreponse object
2014-03-20 16:25:15 +05:30
Kelven Yang
63563b740a
Fix style-check issue after cherry-picks
2014-03-18 17:34:54 -07:00
Kelven Yang
a5f418dd02
Let VMSync be aware of HA take-over on VM state management.
2014-03-18 17:34:36 -07:00
Kelven Yang
0043a8f384
avoid mysql lock-promotion situation.
2014-03-18 17:30:09 -07:00
Nitin Mehta
4723fbb83f
CLOUDSTACK-6247: Usage Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature
...
Work done for network offering.
2014-03-18 13:54:25 -07:00
Nitin Mehta
30a98381bb
CLOUDSTACK-6247: Usage Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature
...
And when the flag is updated on the resource accordingly generate usage events again.
Also when display flag is false in deployvm cmd it should be false for the volumes associated with the vm as well
2014-03-17 18:50:06 -07:00
Min Chen
ae6b9a0829
Remove IAMEntityType to use existing VO interface class to annotate
...
entityType.
2014-03-17 16:59:19 -07:00
Marcus Sorensen
e9e2ee3ac5
CLOUDSTACK-6181: Merge of resize root feature (resize-root branch)
2014-03-14 03:40:08 -06:00
Mike Tutkowski
709d2a096d
CLOUDSTACK-6170
2014-03-14 23:44:50 -06:00
Kelven Yang
1db329f0f9
Fix the missing java imports from automatic merge
2014-03-14 15:08:32 -07:00
Kelven Yang
ba56210127
Deal with concurrent state update for VM and Host objects.
2014-03-14 15:08:04 -07:00
Jayapal
14a4dd116f
CLOUDSTACK-2692 Assigning LB rule for vm nic secondary ips
...
Conflicts:
setup/db/db/schema-430to440.sql
2014-03-14 22:48:51 +05:30