amoghvk
62e63a1bf7
CLOUDSTACK-6358: Missing patches in master for VMware
2014-07-14 16:54:10 -07:00
amoghvk
6831ed4026
CLOUDSTACK-6358: Missing patches in master branch
2014-07-14 15:17:58 -07:00
Mike Tutkowski
62c18ca3fa
Fixing an issue in the AbstractStoragePoolAllocator's filter method where zone-wide storage of HypervisorType.Any is skipped
2014-07-07 22:16:58 -06:00
Santhosh Edukulla
a600d8408e
Fixed Resource Leaks, null dereferences, few other issues reported by coverity
2014-07-04 16:17:58 +05:30
ynojima
1e72e5a818
CLOUDSTACK-6935 remove iSCSI storage filtering logic for Root volume
...
since there is no reason to filter it out
2014-07-01 19:57:19 -06:00
ynojima
32ed9d86ec
Revert "Fixing an issue introduced with Review Request 22717"
...
This reverts commit 12e92e10ff .
2014-07-01 19:54:11 -06:00
Mike Tutkowski
12e92e10ff
Fixing an issue introduced with Review Request 22717
2014-06-26 23:56:11 -06:00
Daan Hoogland
c79ab570b0
Revert "CLOUDSTACK-6967: Initial OVM3 drop"
...
This reverts commit 8a485b9b59 .
2014-06-24 10:24:01 +02:00
Funs
8a485b9b59
CLOUDSTACK-6967: Initial OVM3 drop
...
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit ed47763e25 )
Conflicts:
api/src/com/cloud/network/NetworkService.java
api/src/org/apache/cloudstack/api/ApiConstants.java
api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
plugins/pom.xml
server/src/com/cloud/network/NetworkServiceImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
ui/scripts/docs.js
2014-06-23 12:39:10 +02:00
Anshul Gangwar
bbcffbbab0
CLOUDSTACK-6965: fixed the NullPointerException introduced by fix for cloudstack
...
6935 in AbstractStoragePoolAllocator#filter method for Zone Wide storage
2014-06-23 12:17:08 +05:30
ynojima
318e497e60
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.
2014-06-18 13:45:52 -06:00
ynojima
77e74841a0
Revert "CLOUDSTACK-6935 refactor StoragePoolAllocator#filter logic"
...
This reverts commit 31de58edab .
2014-06-18 13:04:39 -06:00
ynojima
31de58edab
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
2014-06-18 11:07:34 -06:00
Tim Mackey
a8212d9ef4
Cleanup of Xen and XenServer terms. Cloned xen plugin creating a xenserver plugin, then removed xen plugin
...
Signed-off-by: Tim Mackey <tmackey@gmail.com>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-06-07 04:50:23 -04:00
Nitin Mehta
5393387bbd
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
2014-05-30 10:48:42 -07:00
Devdeep Singh
7c2b1deb34
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 14:46:39 +05:30
Devdeep Singh
5ba5da3696
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-09 16:31:34 +05:30
Nitin Mehta
c0f72b25c6
CLOUDSTACK-6530: Make Network and Volume implement Displayable interface. Iterate over all first class entities in the context to decide the display property for event display.
2014-05-08 15:37:20 -07:00
Koushik Das
c9a09f548c
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
2014-05-06 20:27:41 +05:30
Min Chen
8e286996c8
CLOUDSTACK-6478: Failed to download Template when having 3 SSVM's in one
...
zone on Vmware.
2014-04-22 20:11:09 -07:00
Saksham Srivastava
eb195d0575
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:19:08 +05:30
Ding Yuan
c031eb7d38
CLOUDSTACK-6242: exception handling improvements
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-04-15 08:07:15 +02:00
Marcus Sorensen
11f5bdd78d
CLOUDSTACK-6191 Add support for specifying volume provisioning
...
type (thin, sparse, fat) in disk/compute offerings.
Submitted-by: Yoshikazu Nojima <mail@ynojima.net>
Reviewed-by: Marcus Sorensen, Mike Tutowski
2014-04-10 09:23:04 -06:00
Mike Tutkowski
1577e75a3d
CLOUDSTACK-6170 (VMware root-disk support for managed storage)
2014-03-31 00:13:30 -06:00
Edison Su
25a6234a5b
fix build
2014-03-28 16:24:45 -07:00
Edison Su
e656201fee
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-28 16:21:22 -07:00
Daan Hoogland
8b62b2cb92
findbugs: exclude known spiffy hacks a.k.a. false positives
2014-03-28 14:28:10 +01:00
Chris Suich
27008216fe
Revert "Issue CS-5825 Part Resolution"
...
This reverts commit 9a615ee7b2 which was breaking the build.
2014-03-20 15:47:13 -04:00
Alex Hitchins
9a615ee7b2
Issue CS-5825 Part Resolution
2014-03-20 13:30:42 -04:00
Daan Hoogland
8b510d2481
checkstyle: unused import
2014-03-18 13:18:57 +01:00
edison
ed9ed446c2
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-18 12:20:14 +01:00
Min Chen
ae1d6a771b
Remove IAMEntityType to use existing VO interface class to annotate
...
entityType.
2014-03-17 17:19:55 -07:00
Alena Prokharchyk
479986e52b
Fixed compilation error in StorageAllocatorTest.java
2014-03-17 09:58:44 -07:00
Hugo Trippaers
4402685e11
Update master to 4.5.0-SNAPSHOT
2014-03-14 14:55:26 +01:00
Devdeep Singh
2aff39f8c7
CLOUDSTACK-6143: Storage motion support for hyper-v. With these changes a volume on a shared
...
storage pool (SMB) and attached to a running vm can be live migrated to another shared storage
pool. Also a vm and its volumes can be live migrated to another host and storage pool respectively.
2014-03-14 16:27:58 +05:30
Min Chen
8ff94601f1
Merge branch 'rbac' to master
2014-03-13 16:42:22 -07:00
Alena Prokharchyk
6c23e201ad
1) More fixes for the problems found by findBugs
...
2) Corrected some logging in MidoNetPublicNetworkGuru - removed .toString method call on the objects in the log body as toString is called on the object by default when use log4j
2014-03-13 16:05:45 -07:00
Min Chen
99bdc8d875
Merge branch 'master' into rbac.
2014-03-13 11:05:03 -07:00
John Kinsella
09c375379d
CLOUDSTACK-6204: removing realhostip dependency
...
Moving default transport for console proxy, SSVM to http.
See
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes
for more info.
jlk ported Amogh's patch for 4.3 to master - code base is different
enough that patch has multiple issues.
Author: Amogh Vasekar <Amogh Vasekar <amogh.vasekar@citrix.com>
Signed-off-by: John Kinsella <jlk@stratosec.co> 1394398017 -0700
2014-03-09 13:46:57 -07:00
Min Chen
48e08fe676
Merge branch 'master' into rbac.
2014-03-06 14:02:20 -08:00
Mike Tutkowski
b06e66c50a
CLOUDSTACK-6170
2014-03-05 13:55:12 -07:00
Min Chen
d0ae4d9a9f
CLOUDSTACK-5920:Add interface to ControlledEntity to return IAM
...
entity type.
2014-03-05 09:40:55 -08:00
Nitin Mehta
339c4f4c3f
CLOUDSTACK-6199: Action Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature.
...
For root admin - s/he should be able to see all the events despite the value of the flag.
2014-03-04 14:59:30 -08:00
Sanjay Tripathi
624139d8ef
CLOUDSTACK-6172: Volume is not retaining same uuid when migrating from one storage to another.
2014-02-26 14:42:34 +05:30
Prachi Damle
f41604fc6c
Renaming AclEntityType --> IAMEntityType
2014-02-25 16:43:17 -08:00
Hugo Trippaers
ac00ab0087
Cleanup all mysql dependencies and set all to provided.
2014-02-21 14:55:11 +01:00
Alena Prokharchyk
e0de79b170
Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command
2014-02-10 12:05:59 -08:00
Devdeep Singh
306ffa0218
CLOUDSTACK-6053: While adding a primary or secondary of type smb the password wasn't
...
encoded. This cause createStoragePool or addImageStore command to fail if special
characters were present. Updated the code to pass user, password and domain as part
of details while adding primary or secondary. Also made changes on server side to
handle it.
2014-02-10 10:29:09 +05:30
Min Chen
3b58a45e04
Merge branch 'master' into rbac.
2014-02-07 13:43:36 -08:00
Min Chen
bac2c1e5b4
CLOUDSTACK-6049: Give priority to cache stores where data object is
...
already there instead of randomly picking one in case there are multiple
cache stores in the scope.
2014-02-06 17:19:24 -08:00
Min Chen
621276715a
CLOUDSTACK-6046:CreateVolume from snapshot is failing with S3 as
...
secondary storage and zone-wide primary storage.
2014-02-06 15:36:26 -08:00
Ian Southam
cecb216caa
fixBugs finding
...
fm.equals(format) breaks equals contract
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-02-06 10:32:06 +01:00
Nitin Mehta
86cada3b3c
CLOUDSTACK-2932:
...
Allow deleting of snapshots that have errored out. Simply mark the removed column as there is no physical clean up required. It can land into error state only from allocated/Creating state
which are states before creation on primary storage works
2014-02-05 17:34:48 -08:00
Devdeep Singh
a24263fe81
CLOUDSTACK-6030: Encrypt the primary and secondary smb storage password when it is stored in the db.
2014-02-05 15:44:09 +05:30
Alex Huang
7f34282dfa
Removed references to secondarystoragevmmanager from code that doesn't use it.
2014-02-05 01:39:15 +00:00
Prachi Damle
f84375442e
Merge branch 'master' into rbac
...
Conflicts:
api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/com/cloud/template/TemplateAdapterBase.java
setup/db/db/schema-430to440.sql
tools/apidoc/gen_toc.py
2014-02-04 12:07:32 -08:00
Min Chen
9b21da65d1
CLOUDSTACK-6025:CreateTemplate from snapshot in NFS is failing , after
...
migarting to S3 datastore.
2014-02-04 11:01:51 -08:00
Daan Hoogland
ca1b340cef
findbugs make use of return of string manipulation
2014-02-04 11:21:01 +01:00
Min Chen
b35eb04de3
CLOUDSTACK-6017: NPE while creating snapshot multiple times on same Root
...
volume with S3 as secondary storage.
2014-02-03 12:16:19 -08:00
Hugo Trippaers
d56c5dfc13
Fix for a potential NPE
2014-01-31 09:37:11 +01:00
Min Chen
16a9171f55
Fix trailing whitespace.
2014-01-28 14:53:18 -08:00
Min Chen
a26c81178b
CLOUDSTACK-5971:Templates created from a snapshots can't be copied to
...
other zones.
2014-01-28 14:49:58 -08:00
Min Chen
33cd1ab921
Merge branch 'master' into rbac
2014-01-22 11:23:51 -08:00
Min Chen
c0da0a884a
CLOUDSTACK-5921:S3 security key is stored in DB unencrypted
2014-01-21 14:34:32 -08:00
Min Chen
929fbabaa2
Merge branch 'master' into rbac.
2014-01-17 14:37:08 -08:00
Mike Tutkowski
3ef560d925
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-16 12:15:18 -07:00
Alex Huang
68b8891c62
Removed all reminants of the IdentityService. Created the KeysManager to move the management
...
of keys out of management server
2014-01-14 13:11:35 -08:00
Mike Tutkowski
21a44934b4
Removed a duplicate method
2014-01-10 13:36:04 -07:00
Marcus Sorensen
fc082832d3
CLOUDSTACK-5853
...
Create two storage pools, one with storage tag X, one with storage tag Y.
Create a service offering with storage tag X.
Create a disk offering with storage tag Y.
Attempt to deploy a virtual machine with a datadisk, using given offerings, it fails.
Deployment planner keeps a global object 'avoid'. It loops through each volume to
be created, asking storage allocators for matching pools, passing this avoid object.
First disk matches a pool or pools, adds ALL other pools to avoid object, then
deployment planner attaches matching pools to a list for that disk.
Second disk matches a pool, adds all other pools to avoid object, then deployment
planner says "wait, matching pool is in avoid, can't use it". Oops. In fact, at this
point ALL pools are in avoid (unless there are other pools that have both tags).
Need to remove matching pool from the avoid set during each select phase.
2014-01-10 11:55:54 -07:00
Mike Tutkowski
ae35782ccd
Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials
2014-01-09 21:36:34 -07:00
Alex Huang
ae8560b195
Moved security out into its own jar. Will be adding more to it. Fixed a few white space issues brought up by checkstyle in eclipse.
2014-01-09 16:12:25 -08:00
Mike Tutkowski
03118c2969
Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)
2014-01-09 14:44:35 -07:00
Min Chen
3223028fd6
CLOUDSTACK-5841:Snapshots taken before migration NFS to S3 can not be
...
used cross-zone.
2014-01-08 17:43:06 -08:00
Min Chen
858b9b1177
CLOUDSTACK-5813: With S3 as secondary storage, snapshot taken in one
...
zone cannot be used to create volume in another zone. zoneId parameter
in createVolumeCmd is not observed.
2014-01-08 17:15:04 -08:00
Sanjay Tripathi
3ad0e8fb47
CLOUDSTACK-5701: physical size is not getting updated in snapshot_store_ref table.
2014-01-06 11:36:43 +05:30
Sateesh Chodapuneedi
6ba9754201
CLOUDSTACK-5447 [Automation] Volume migration failing with NullPointerException in vmware and KVM.
...
Instead of injecting object of VolumeOrchestrationService into VmwareResource, we now populate the command object (MigrateVolumeCommand here) with required information. Thus we dont need volume orchestration service to query that information from resource.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-12-31 06:31:43 +05:30
Min Chen
6f800506fd
CLOUDSTACK-5653:S3 object store as Secondary Storage, the template
...
created from different zone is not available for the other zones.
2013-12-26 14:48:21 -08:00
Min Chen
5d262d7b59
CLOUDSTACK-5648:CopyTemplate and CopyISO across zones fails after NFS
...
migration to S3.
2013-12-26 12:39:39 -08:00
Likitha Shetty
e659751a8a
CLOUDSTACK-5508. Vmware - When there are multiple secondary stores, the newly added secondary store is not being selected for backing up snapshots.
...
If the snapshot being backed up is a a delta snapshot, pick the image store where the parent snapshot is stored. Otheriwse pick a random image store.
2013-12-24 17:34:19 +05:30
Alex Huang
c2baed665b
Moved the check-style.xml into the tools directory given that we're not using the project to reference the style any longer. Fixed problems with eclipse complaining about copy-dependencies
2013-12-20 17:21:34 -08:00
Edison Su
e52a4d9306
CLOUDSTACK-5572: quicevm won't save memory, as it needs pv driver installed
...
Conflicts:
engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java
2013-12-20 12:36:30 -08:00
Edison Su
62bb5d8848
fix checkstyle
2013-12-19 15:05:58 -08:00
Edison Su
0824c78761
CLOUDSTACK-4939 - Failed to create snapshot (KVM, Multiple hosts, Sharedstorage)
...
Conflicts:
engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
Conflicts:
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java
plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
2013-12-19 14:17:30 -08:00
Edison Su
8caf52c6bc
add xenserver 6.2.0 hotfix support, to optimize vdi copy
...
add xenserver hot fix
Conflicts:
api/src/com/cloud/vm/VirtualMachineName.java
core/src/com/cloud/host/HostInfo.java
core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
deps/XenServerJava/src/com/xensource/xenapi/VDI.java
engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
server/src/com/cloud/configuration/Config.java
2013-12-19 14:15:41 -08:00
Edison Su
c40d03b417
CS-18582: if EIP is used, extract volume and template returns wrong public ip address. If remote agent is ssvm agent, then looking up public ip address from ssvm table
...
Conflicts:
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeServiceTest.java
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTestVmware.java
engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java
engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
2013-12-19 14:01:20 -08:00
Min Chen
bb91b739a8
CLOUDSTACK-5541: Template Creation from snapshot failed with S3 store.
2013-12-18 15:44:00 -08:00
Min Chen
46d1e1afb2
CLOUDSTACK-5446:KVM-Secondary Store down-Even after secondary store is
...
brought back up after being down for few hours,snapshot jobs do not get
triggered with reason "there is other active snapshot tasks on the
instance to which the volume is attached".
2013-12-13 22:04:29 -08:00
Prachi Damle
7c6f1c14c2
ControlledEntity Interface change to return EntityType and added values to the AclEntityType enum and
2013-12-12 16:31:00 -08:00
Alex Huang
be5e5cc641
All Checkstyle problems corrected
2013-12-12 12:26:07 -08:00
Min Chen
df1c34bf2b
CLOUDSTACK-5451:Restart MS after migrating NFS image store to S3,
...
previous Ready template is not ready anymore.
2013-12-11 14:18:06 -08:00
Min Chen
010b007ee4
CLOUDSTACK-5414: With NFS Image Store migrated to S3 an error is thrown
...
in creation of Virtual Router.
2013-12-11 14:17:43 -08:00
Alena Prokharchyk
bd6f706b72
CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API
...
Conflicts:
engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
server/src/com/cloud/alert/AlertManagerImpl.java
server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
usage/src/com/cloud/usage/UsageManagerImpl.java
listAlerts: introduced new parameter "name" to the alertResponse
Conflicts:
api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
server/src/com/cloud/alert/AlertManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
Added new Admin API - generateAlert. Available to ROOT admin only
Conflicts:
api/src/org/apache/cloudstack/alert/AlertService.java
api/src/org/apache/cloudstack/api/BaseCmd.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
listAlerts: implemented search by alert name
Conflicts:
api/src/org/apache/cloudstack/alert/AlertService.java
api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
engine/schema/src/com/cloud/alert/AlertVO.java
2013-12-04 10:05:46 -08:00
Wei Zhou
81c07f1791
allow delete snapshot with ERROR state
2013-11-28 10:48:07 +01:00
Alex Huang
433a631916
Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code.
2013-11-21 07:56:47 -08:00
Hugo Trippaers
cf715ff491
Bump 4.3.0 to 4.4.0 in master
2013-11-21 16:01:15 +01:00
Alex Huang
d620df2bdd
Reformatted all of the code.
2013-11-21 06:15:26 -08:00
Alex Huang
eaa250fd3c
Formatted again after all the tab expansions and eol removals
2013-11-21 04:47:01 -08:00
Alex Huang
224f479974
Removed trailing spaces
2013-11-21 04:08:01 -08:00
Wido den Hollander
1edaa36cc6
CLOUDSTACK-1302: Allow a cache mode per disk offering
...
Per disk offering the setting none, writeback or writethrough can be set
This allows for both safety and performance for writes.
2013-11-20 17:11:10 +01:00
Alex Huang
8d62744681
Reformat all source code. Added checkstyle to check the source code
2013-11-20 07:26:53 -08:00