Commit Graph

8452 Commits

Author SHA1 Message Date
Edison Su 50d5d488d4 add event for volume migration
Reviewed-by: Frank
2014-12-17 14:33:54 -08:00
Prachi Damle 01ae7120ac CLOUDSTACK-8078: [Automation] Deletion of Affinity Groups - CloudRuntimeException: No Event Pubish can be wrapped within DB Transaction!
Changes:
-     The event of deleteing an affinity group is published on the MessageBus so that IAM Service can listen and process the event, However the publish operation should not be handled within a DB transaction, since it may take longer and hold the DB transaction for long unnecessarily
-    Publish any events to MessageBus outside of the transaction

Conflicts:
	server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
2014-12-17 13:53:11 -08:00
Prachi Damle a7861aa5fa CLOUDSTACK-8079: If the cluster capacity threshold is reached, HA-enabled VM is not migrated on another host during HA
Changes:
-  When there is HA we try to redeploy the affected vm using regular planners and if that fails we retry using the special planner for HA (which skips checking disable threshold)
Now because of job framework the InsufficientCapacittyException gets masked and the special planners are not called. Job framework needs to be fixed to rethrow the correct exception.
- Also the VM Work Job framework is  not setting the DeploymentPlanner to the VmWorkJob.  So the HA Planner being passed by HAMgr was not getting used.
- Now the job framework sets the planner passed in by any caller of the VM Start operation, to the job
2014-12-17 13:48:24 -08:00
Min Chen 9fb654cbad CLOUDSTACK-8077: Not able to deploy VM using a shared template. 2014-12-16 16:40:37 -08:00
Jayapal aca0f79592 CLOUDSTACK-8072: Fixed NPE in deleting default ACL items in default ACL 2014-12-15 16:44:08 +05:30
Anshul Gangwar b07c9b7a9c CLOUDSTACK-8067: Fixed NPEs in MS log related to console proxy VM
(cherry picked from commit 1115bc9cc6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-12 21:41:38 +05:30
Wei Zhou 76dc20a0ee CLOUDSTACK-255: fix NPE in createPortForwardingRule due to no PortForwarding provider
(cherry picked from commit c9d492d714)
2014-12-12 11:15:08 +01:00
Min Chen fbe54974c5 CLOUDSTACK-8061: Extracting volume when it is in migrating state causes
both the operations to fail.
2014-12-11 11:36:34 -08:00
Rohit Yadav e59dac201d CLOUDSTACK-8014: Fix NPE searching including removed templates
Steps to reproduce if you have this issue:
- Create a VM's volume snapshot
- Remove VM's template and mark the template as removed with timestamp in DB
- Restart mgmt server and create a volume out of snapshot you should get NPE

Fix: In `storagePoolHasEnoughSpace`, we're only searching for a VM's volume's
snapshot's template by Id and not including removed templates. This is a corner
case and NPE hits when template has been marked removed for a VM's volume's
template so we should search including removed templates.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f189c105d8)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-10 19:30:56 +05:30
Jayapal 8278d88f76 CLOUDSTACK-8030: Updated router to come up egress default ALLOW
On default iptables rules are updated to add ACCEPT egress traffic.
    If the network egress default policy is false, CS remove ACCEPT and adds the DROP rule which
    is egress default rule when there are no other egress rules.

    If the CS network egress default policy is true, CS won't configure any default rule for egress because
    router already came up to accept egress traffic. If there are already egress rules for network then the
    egress rules get applied on VR.

    For isolated network with out firewall service, VR default allows egress traffic (guestnetwork --> public network)
2014-12-10 10:13:41 +05:30
Koushik Das 016d009adf CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash
The last commit 513adab51b didn't fully fix it. Scenario #1 was not handled, only #2 was handled.
Fixed #1 as part of this commit.
1. If VM is in stopped state in CS due to 'PowerMissing' report from old host (hostId is null) and then there is a 'PowerOn' report from new host
2. If VM is in running state in CS and there is a 'PowerOn' report from new host
2014-12-09 11:46:45 +05:30
Jayapal 2d7f0c693b CLOUDSTACK-8027: Update error msg for enable static nat 2014-12-05 12:55:41 +05:30
Damodar 7ef0f5507d Attach volume events are not correctly shown in events.
Signed-off-by: Koushik Das <koushik@apache.org>
2014-12-04 20:01:41 +05:30
Sheng Yang feeafa76a4 CLOUDSTACK-5241: Remove Rot13 cipher 2014-12-03 19:30:31 -08:00
Min Chen 344d98e0bd CLOUDSTACK-7981: added back resource tag related columns to user_vm_view to support resource tag related search. 2014-12-03 09:48:07 -08:00
Sheng Yang c987080c26 CLOUDSTACK-7999: Always override local keystore file with the entry in DB 2014-12-01 18:59:25 -08:00
Koushik Das 513adab51b CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash
Ensure that VR is re-booted when it is moved to another host out-of-band. This is necessary to re-program all network rules
2014-12-01 18:09:58 +05:30
Rohit Yadav 5241d0faf8 CLOUDSTACK-7903: Fix build regression from previous fix
The previous fix tried to access StatsCollector from UsageManagerImpl
which is not possible due to dependency cycle.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 1e0880cbab)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-12-01 16:39:01 +05:30
Ilia Shakitko e124781445 CLOUDSTACK-7903: Decreased minimal usage aggregation range value
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 9b907902d2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-12-01 15:55:30 +05:30
Rohit Yadav d28b716d8a CLOUDSTACK-7989: Ignore Auth API calls in unauthenticated HTTP handlers
If an auth API call (such as login, logout) is called on unauthenticated port
such as the 8096 integration server port, we need to ignore such API calls
as calling auth APIs on 8096 is un-necessary and is undefined.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 21a6bef53b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-28 15:46:17 +05:30
Harikrishna Patnala cdfdda2051 CLOUDSTACK-6075: Increase the ram size for router service offering
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 488c17858f)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-27 16:05:34 +05:30
Min Chen bf8dd828f5 CLOUDSTACK-7981: listVirtualMachine is too slow in case of duplicate
resource tags due to joining user_vm_details to user_vm_view.
2014-11-26 17:40:06 -08:00
Harikrishna Patnala eae733817b CLOUDSTACK-6465: vmware.reserve.mem is missing from cluster level settings
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2014-11-25 12:22:31 +05:30
Daniel Vega c919ff83d8 CLOUDSTACK-7917: Validating Load Balancer Rule when updating LB + unit test
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2014-11-25 11:55:43 +05:30
Edison Su 7175247c5e CLOUDSTACK-7966:
remove snapshot_store_ref entry, in which role is Primary, during
storage GC
2014-11-24 14:30:32 -08:00
Min Chen b85183ede7 CLOUDSTACK-7678:volumes are getting uploaded successfully with wrong
url.
2014-11-21 15:18:47 -08:00
Syed 9f8d0051ed CLOUDSTACK-7952: Remove private key from SslCertResponse (listSslCerts)
Signed-off-by: Will Stevens <wstevens@cloudops.com>
2014-11-21 03:39:57 -05:00
Will Stevens 1be6fb143e CLOUDSTACK-7822: Fixed SSL Cert Tests and relaxed chain validation
Signed-off-by: Will Stevens <wstevens@cloudops.com>
2014-11-21 03:38:52 -05:00
Min Chen 66e0f049db CLOUDSTACK-7954:ListTags API is ignoring the resourceID and displaying
all the tags of all resources.
2014-11-20 09:48:07 -08:00
Edison Su bd79965329 CLOUDSTACK-7947:
double check if parent snapshot is removed or not, when creating new
snapshot

Reviewed-by: Min
2014-11-19 16:12:28 -08:00
Edison Su 15c0efb774 CLOUDSTACK-7946:
fix compile
2014-11-19 16:08:54 -08:00
Edison Su d856a2acad CLOUDSTACK-7946:
remove leftover state in volume and snapshot table in case of mgt server
shutdown during storage operation.
Reviewed-by: Min
2014-11-19 16:08:27 -08:00
Prachi Damle 968ca060ee CLOUDSTACK-5853 cannot deploy vm with differing service storage tag and data disk storage tag
Changes:
- Reverting Marcus's fix since this issue has already fixed by https://issues.apache.org/jira/browse/CLOUDSTACK-5426
2014-11-18 14:07:51 -08:00
Prachi Damle 7f54894045 CLOUDSTACK-7559 After migrating root volume to other cluster wide storage, start VM is not running the VM with root disk from new storage.
Changes:
- During VM start, do not use the last host Id, if the host's cluster does not match the cluster provided in the deployment plan.
2014-11-18 14:07:49 -08:00
Anshul Gangwar 9c328cb9dd CLOUDSTACK-7929: While creating network offering if one specifies negative value for network rate then we will convert that value to 0 i.e. unlimited
This closes #40
2014-11-18 14:25:30 +05:30
Anshul Gangwar 8307dd9105 CLOUDSTACK-7930, CLOUDSTACK-7931: Do not allow to set invalid values for global settings which are of type integer and float
This closes #41
2014-11-18 14:25:12 +05:30
Anshul Gangwar 4721e66d0e CLOUDSTACK-7541: Added restriction to not allow custom disk offering with disksize UI doesn't allow but with API we were able to create custom disk offering with disk size which was causing this issue
This closes #28
2014-11-18 14:24:58 +05:30
Anshul Gangwar 44d12330b9 CLOUDSTACK-7758: Fixed although api calls are failing, event tab shows them as successful
This closes #29
2014-11-18 14:24:47 +05:30
Anshul Gangwar ae199b6ce7 CLOUDSTACK-7703, CLOUDSTACK-7752: Fixed deployment planner stuck in infinite loop.
If we create VM with shared service offering and attach disk with local disk offering,
and one of storage pool is full(cannot be allocated) and other is not full then
we are not putting the cluster in avoid list which is causing this infinite loop.

Fixed by putting the cluster in avoid list even if one of the storage pool is full(cannot be allocated)
2014-11-18 14:12:45 +05:30
Anshul Gangwar c04cdae60b CLOUDSTACK-7767: fixed events are not generated for snapshot creation 2014-11-18 14:12:33 +05:30
Anshul Gangwar f43ffb9a0f CLOUDSTACK-7688, CLOUDSTACK-7747: restricted various operations for VM with VM snapshots which breaks VM snapshots.
Now they are informed that they cannot perform the operation.
 To perform operation they have to remove VM snapshots of VM.
2014-11-18 14:12:02 +05:30
Damodar 7e6ec2ce82 CLOUDSTACK-7877: The NET.IPRELEASE events are not added to usage_event on IP range deletion from Physical Networks.
Signed-off-by: Jayapal <jayapal@apache.org>
2014-11-14 10:31:46 +05:30
Koushik Das 03e63a67e0 CLOUDSTACK-7902: Account creation results in exception in logs
Event publish code was wrapped in transaction, moved it out
2014-11-13 14:41:33 +05:30
Damodar f1361796bf CLOUDSTACK-7886: cloudstackoperations like deployvm,deleteNW are failing if CS fail to contact rabbit mq server. This is happening in case of Async API calls.
Signed-off-by: Koushik Das <koushik@apache.org>
2014-11-12 10:24:56 +05:30
Koushik Das 6d268db217 CLOUDSTACK-7880: Creating shared network results in exception
This is due to event publish being wrapped in a transaction, moved it outside of transaction scope.
2014-11-11 16:32:20 +05:30
Santhosh Edukulla c916f30574 CLOUDSTACK-7828.Avoid marking IPs already in Allocated as Allocated again. Use row lock to ensure that prev state is either Allocating or Free. This will inturn avoid logging duplicate events 2014-11-10 21:22:47 +05:30
Rohit Yadav c401dbc8f9 CLOUDSTACK-7871: allow VM and template details update using update APIs
Allows updating details (key/value) pair which updatse entries
invm_template_details and user_vm_details tables using updateVM and updateTemplate
APIs. This allows sys admins to update nics, controllers etc without DB hacking.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 97fa4a023e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-10 17:53:26 +05:30
Jayapal 0bd34d389f CLOUDSTACK-7872: network getting shutdown inspite of running VM's in the network 2014-11-10 15:26:48 +05:30
Bharat Kumar 310bb255ac CLOUDSTACK-7760 Data disk size is not considering for primary storage resource limit check 2014-11-10 15:07:13 +05:30
Koushik Das 54ec268b7e CLOUDSTACK-7869: Add simulator support for findHostsForMigration API 2014-11-08 13:50:43 +05:30
Koushik Das e25de54b4c CLOUDSTACK-7421
Unnecessary exception in MS logs while removing default NIC from VM. Following changes are made:
1. Changed the exception from CloudRuntimeException to InvalidParameterValueExecption.
2. Moved out validation logic to UserVMManagerImpl from VirtualMachineManagerImpl.
3. Handling InvalidParameterValueException from async API calls so that they are not logged as ERROR in MS logs.
2014-11-08 13:50:15 +05:30
Sanjay Tripathi 1c9775b0df CLOUDSTACK-7859: Host tags are not getting removed in cloud.host_tags table when a Host is deleted from CS. 2014-11-07 17:34:16 +05:30
Edison Su 812b0122e2 CLOUDSTACK-7683: hold a db lock during vm expunge 2014-11-06 15:37:15 -08:00
Edison Su ffdb38c496 there is no transaction context during the mgt server start, thus causing transaction.close will delete op_lock table if aquireinlocktable is called Reviewed-by: Anthony and Min 2014-11-06 15:30:19 -08:00
Edison Su 1fb28c2959 CS-21296: hidden snapshot.backup.rightafter, as it's not needed 2014-11-06 15:29:56 -08:00
Sanjay Tripathi 5a67fe7369 CLOUDSTACK-7842: wrong size column is getting updated with snapshot physical size in snapshot_store_ref table.
Also fixed the issue that snapshot size with hypervisor XS >= 6.2.5 is not getting updated in snapshot_store_ref table.
2014-11-05 16:44:54 +05:30
Rajani Karuturi c3e5964dcb Fixed CLOUDSTACK-7242: Adding a securing config using configDepo doesnt work
In ConfigurationVo, changed the setter to do the encryption if required
like the getter. Called the setter in constructor as well.

Removed references of encryption check in different places.

Reviewed-by: Santhosh Edukulla

This closes #35
2014-11-05 11:49:38 +05:30
Sanjay Tripathi 9168d826da CLOUDSTACK-7372: [vGPU] When a host is put in maintenance mode, vGPU enabled VMs
failed to migrate to the other host in the cluster.

Migration for vGPU VMs is not supported in XS, so instead of migrating them to
new server, stopping them.
2014-11-04 17:28:22 +05:30
Min Chen 07ba078ee6 CLOUDSTACK-7833: VM Async work jobs log "Was unable to find lock for the key vm_instance" errors as warning 2014-11-03 11:19:06 -08:00
amoghvk 6df396c9c0 Merge branch '4.5' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.5 2014-10-31 15:29:40 -07:00
amoghvk 0c153966e6 CLOUDSTACK:6915 search including removed 2014-10-31 15:29:07 -07:00
Nitin Mehta 2652195010 CLOUDSTACK-7825: Report both virtual size and physical size for the snaphost usage event. 2014-10-31 15:24:32 -07:00
Rohit Yadav cd52bed477 saml: Use camelCase api names for SAML login/logout apis
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 85c0bd68ae8a76c231ab402dd0311e3672155f71)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-10-31 00:32:29 +05:30
Min Chen 055901acda CLOUDSTACK-7797: listSupportedNetworkServices API takes more than 1 second to
complete, slow compared to previous 4.3 release.
2014-10-27 17:00:42 -07:00
Sheng Yang dd7026b20e CLOUDSTACK-1771: Fix VR IP change when restartnetwork with cleanup=true in basic zone
In basic network, the correct network id associate with IP is source network id
rather than network id.
2014-10-27 16:49:30 -07:00
Sanjay Tripathi db6a0d65aa No need to log discrepancy resource count message for Primary and secondary storage. 2014-10-27 15:26:06 +05:30
Sanjay Tripathi c5fa7cc494 Correct the error message when tried created VM Snapshot with memory on a vGPU Instance.
"VM snapshot with MEMORY is not supported for VGU enabled VMs."
Change VGU to vGPU.
2014-10-27 13:59:59 +05:30
Anthony Xu c52e14730e when host is pingtimeout and CCP can not determine the host status, put the host to Alert status , no VM HA. 2014-10-22 15:07:40 -07:00
Anthony Xu 0141b37784 CLOUDSTACK-7761:
Revert "when system VM ping times out, stop system VM"

This reverts commit ee23be1942.
2014-10-21 17:21:17 -07:00
Nitin Mehta 287ff83552 CLOUDSTACK-7754: Templates source_template_id is null when it is created from Snapshot with its corresponding volume removed. Fix it by searching for volumes including removed. 2014-10-20 16:49:48 -07:00
Sanjay Tripathi 420d4e0da0 CLOUDSTACK-7739: Add new vGPU types K160Q, K180Q, K280Q to the CloudStack UI. 2014-10-16 14:25:30 +05:30
Sanjay Tripathi 5025071954 Config value having different category in SQL and Config.java. 2014-10-16 14:01:23 +05:30
Sanjay Tripathi 80e0c99189 Removed duplicate code and unused imports which was causing build failure. 2014-10-16 13:53:32 +05:30
Jayapal 53ee4cd794 CLOUDSTACK-7728: Removed duplicate import 2014-10-16 10:05:06 +05:30
Jayapal e257c13f16 CLOUDSTACK-7728: Fixed adding iptables rules for egress allow on VR reboot 2014-10-16 09:38:21 +05:30
Jayapal f488a8f72c CLOUDSTACK-7728: Fixed adding icmp rules with different types and codes 2014-10-16 09:38:21 +05:30
Bharat Kumar 080bc2e2e9 CLOUDSTACK-7536 user vm can get a gateway ip when gateway ip is a part of the guest ip range.
Signed-off-by: Jayapal <jayapal@apache.org>
2014-10-16 09:38:21 +05:30
Nitin Mehta 42f628c61c CLOUDSTACK-7532: Template status is not shown in UI/API response for non-default account users. Show it if the owner of the template is the caller 2014-10-15 13:53:39 -07:00
Sanjay Tripathi 176e0d47bb CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect
GPU enabled hosts from non-GPU VM deployment.
Cluster reordering is based on the number of unique host tags in a cluster,
cluster with most number of unique host tags will put at the end of list.
Hosts with GPU capability will get tagged with implicit tags defined by
global config param 'implicit.host.tags' at the time os host discovery.

Also added FirstFitPlannerTest unit test file.
2014-10-14 17:55:37 +05:30
Nitin Mehta a6d575b127 CLOUDSTACK-7699: Disable ROOT volume attach/detach ability. 2014-10-13 13:57:45 -07:00
Edison Su c10189f79a if vpc public network with snat enabled, then will triger this issue;
(cherry picked from commit 6b8e0baa21)
2014-10-13 00:39:10 -04:00
amoghvk da73d735b2 Revert "CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect"
This reverts commit d910b4ff14 since it is causing encryption/decryption issues with RPM builds

(cherry picked from commit fbcab01ff0)
2014-10-13 00:37:34 -04:00
Kishan Kavala db79dd1ef5 CLOUDSTACK-2625, CLOUDSTACK-3401: Usage records are ordered by start_date which is not unique. While listing large datasets or when page size is small this will result in duplicates. Order records by id instead
(cherry picked from commit 63109a97b1)
2014-10-13 00:36:30 -04:00
Sanjay Tripathi eb447f14e2 CLOUDSTACK:7323: [vGPU] Creation of VM snapshot with "memory" is failing.
VM snapshot with memory is not supported for VGPU VMs, so putting checks
for same.

(cherry picked from commit 123ec8b3d3)
2014-10-13 00:35:13 -04:00
Sanjay Tripathi d058fa6880 CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect
GPU enabled hosts from non-GPU VM deployment.
Cluster reordering is based on the number of unique host tags in a cluster,
cluster with most number of unique host tags will put at the end of list.
Hosts with GPU capability will get tagged with implicit tags defined by
global config param 'implicit.host.tags' at the time os host discovery.

Also added FirstFitPlannerTest unit test file.

(cherry picked from commit d910b4ff14)
2014-10-13 00:32:03 -04:00
Santhosh Edukulla 0df43197d9 Fixed few coverity issues
(cherry picked from commit 45597766a5)
2014-10-13 00:30:01 -04:00
Anthony Xu ba1862836e ccp should not check public ip resource when deploy a vm on shared network
(cherry picked from commit 3201251256)
2014-10-13 00:27:01 -04:00
Sanjay Tripathi 47d2a578ee CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect
GPU enabled hosts from non-GPU VM deployment.
Cluster reordering is based on the number of unique host tags in a cluster,
cluster with most number of unique host tags will put at the end of list.
Hosts with GPU capability will get tagged with implicit tags defined by
global config param 'implicit.host.tags' at the time os host discovery.

Also added FirstFitPlannerTest unit test file.

(cherry picked from commit 39fe766c2b)
2014-10-13 00:15:03 -04:00
Likitha Shetty 54110edda1 CLOUDSTACK-6969. Data Volume Shrink operation failing with "Unexpected Exception".
(cherry picked from commit bca71ec169)
2014-10-13 00:14:09 -04:00
Kishan Kavala 759b5fa048 For network stats aggregation job, get the most recent mgmt server id to do the aggregation. Set dao filter to descending.
(cherry picked from commit ce5c35b193)
2014-10-13 00:13:45 -04:00
Anthony Xu ee23be1942 when system VM ping times out, stop system VM
(cherry picked from commit 847e1e47ae)
2014-10-13 00:11:21 -04:00
Jayapal 26ac4dd395 CLOUDSTACK-7615: Update log msg to print error msg rather than exception
(cherry picked from commit 1d01ee3a60)
2014-10-13 00:06:40 -04:00
Devdeep Singh 549840dd0d CLOUDSTACK-7495. Volume resize is only supported on kvm, vmware and xenserver. If
the operation is tried on other hypervisors it fails but logs a stack trace. We
should just log a message that the operation isn't supported.

(cherry picked from commit ec1123aca1)
2014-10-13 00:01:55 -04:00
Rohit Yadav 6e04f93785 CID-1192822: ids is a List<Long>, the cast to List<?> is removed
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 92858afd55)
2014-10-12 23:58:17 -04:00
Rohit Yadav 4d8dfc9b7c CID-1192810: Remove useless control flow
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f74446a195)
2014-10-12 23:58:06 -04:00
Rohit Yadav ff42d5ad54 CID-1211005: Fix comparison, Class<?> is always instance of Class
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 59482b3eba)
2014-10-12 23:57:53 -04:00
Rohit Yadav a35521315e CID-1223274: Remove dead local storage code from VolumeApiServiceImpl
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 60e492aeb9)
2014-10-12 23:57:13 -04:00
Koushik Das 1b0618d39c CLOUDSTACK-7595: Config parameters "job.expire.minutes" and "job.cancel.threshold.minutes" incorrectly getting multiplied by a factor of 60
Removed the unnecessary multiply factor for both the config parameters. Also removed the duplicate entries from Config.java as these are not required

(cherry picked from commit a6ee4112a5)
2014-10-12 23:43:01 -04:00
Nitin Mehta 988b9efc97 CLOUDSTACK-7588: [Vmware] Creating templates (with same names) from volumes get deleted from CS. Fix it by changing the unique name generation to the standard one used by registertemplate. Also cleaned up vmtemplatevo which had too many constructors.
(cherry picked from commit 082aed3d33)
2014-10-12 23:39:21 -04:00
David Nalley ffe846673c more revert cleanup 2014-10-12 23:31:17 -04:00