Mike Tutkowski
b508fb8692
Adding support for cross-cluster storage migration for managed storage when using XenServer
2016-09-12 07:39:13 -06:00
Rohit Yadav
9555492b4d
Merge branch '4.9'
2016-08-23 14:16:53 +05:30
Rohit Yadav
f13c224da1
Updating pom.xml version numbers for release 4.9.1.0-SNAPSHOT
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2016-08-19 13:53:39 +05:30
Will Stevens
62aa3b2bfa
Updating pom.xml version numbers for release 4.10.0-SNAPSHOT
...
Signed-off-by: Will Stevens <williamstevens@gmail.com>
2016-07-29 10:11:34 -04:00
Will Stevens
227ff3884d
Updating pom.xml version numbers for release 4.9.0
...
Signed-off-by: Will Stevens <williamstevens@gmail.com>
2016-07-25 16:56:04 -04:00
Mike Tutkowski
2bd035d199
Support for backend snapshots with XenServer
2016-05-13 01:02:04 -06:00
Mike Tutkowski
dad9e5d868
CLOUDSTACK-8813: Notify listeners when a host has been added to a cluster, is about to be removed from a cluster, or has been removed from a cluster
2016-05-11 08:02:46 -06:00
Rohit Yadav
8af677a0f0
maven: fix dependency version support by JDK7
...
- Fix jetty dependency that is compatible with Java7
- Upgrade minor revisions of dependencies
- Upgrade vmware mvn sdk dependency to 6.0
- Downgrade bounty castle version to 1.46 (same as before)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2016-04-22 17:29:59 +05:30
Rohit Yadav
bb29b1d063
maven: Upgrade dependency versions
...
Updated most dependencies to latest minor releases, EXCEPT:
- Gson 2.x
- Major spring framework version
- Servlet version
- Embedded jetty version
- Mockito version (beta)
- Mysql lib minor version upgrade (breaks mysql-ha plugin)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2016-04-22 16:20:16 +05:30
Remi Bergsma
43ab98d823
Updating pom.xml version numbers for release 4.9.0-SNAPSHOT
...
Signed-off-by: Remi Bergsma <github@remi.nl>
2016-01-26 15:12:20 +01:00
Remi Bergsma
32fcc47117
Updating pom.xml version numbers for release 4.8.1-SNAPSHOT
...
Signed-off-by: Remi Bergsma <github@remi.nl>
2016-01-26 09:39:00 +01:00
Remi Bergsma
62f218b7bd
Updating pom.xml version numbers for release 4.8.0
...
Signed-off-by: Remi Bergsma <github@remi.nl>
2016-01-20 23:43:35 +01:00
Remi Bergsma
8f5a2920e8
Updating pom.xml version numbers for release 4.8.0-SNAPSHOT
...
Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-21 22:09:31 +01:00
Remi Bergsma
1f53f2a93e
Updating pom.xml version numbers for release 4.7.0-SNAPSHOT
...
Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-15 18:54:13 +01:00
Mike Tutkowski
7d1dc97423
CLOUDSTACK-8985: Deleted volume's removed column not updated
2015-10-27 15:04:15 -06:00
Wei Zhou
92344c006d
CLOUDSTACK-5863: revert volume snapshot for KVM/QCOW2
2015-08-24 11:01:50 +02:00
Remi Bergsma
64ff67da55
Merge pull request #654 from DaanHoogland/CLOUDSTACK-8656
...
Cloudstack 8656: do away with more silently ignoring exceptions.a lot of messages added.
some restructuring for test exception assertions and try-with-resource blocks
* pr/654: (29 commits)
CLOUDSTACK-8656: more logging instead of sysout
CLOUDSTACK-8656: use catch block for validation
CLOUDSTACK-8656: class in json specified not found
CLOUDSTACK-8656: removed unused classes
CLOUDSTACK-8656: restructure of tests
CLOUDSTACK-8656: reorganise sychronized block
CLOUDSTACK-8656: restructure tests to ensure exception throwing
CLOUDSTACK-8656: validate the throwing of ServerApiException
CLOUDSTACK-8656: logging ignored exceptions
CLOUDSTACK-8656: try-w-r removes need for empty catch block
CLOUDSTACK-8656: try-w-r instead of clunckey close-except
CLOUDSTACK-8656: deal with empty SQLException catch block by try-w-r
CLOUDSTACK-8656: unnecessary close construct removed
CLOUDSTACK-8656: message about timed buffer logging
CLOUDSTACK-8656: message about invalid number from store
CLOUDSTACK-8656: move cli test tool to separate file
CLOUDSTACK-8656: exception is the rule for some tests
CLOUDSTACK-8656: network related exception logging
CLOUDSTACK-8656: reporting ignored exceptions in server
CLOUDSTACK-8656: log in case we are on a platform not supporting UTF8
...
Signed-off-by: Remi Bergsma <github@remi.nl>
2015-08-14 21:38:49 +02:00
Mike Tutkowski
8fcc76e7ff
Fixing a FindBugs issue related to PR 674
2015-08-12 22:57:59 -06:00
Mike Tutkowski
55ae168cdd
Merge pull request #674 from Mike Tutkowski (mike.tutkowski@solidfire.com)
...
* pr/674:
getUsedBytes should query the SolidFire cluster to acquire the size of the given volume if there is no volume_details info for that volume (and then create a volume_details row for this volume so we don't have to make that cluster call for this purpose again)
Signed-off-by: Mike Tutkowski
Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com>
2015-08-12 12:48:36 -06:00
Mike Tutkowski
bcfbc6d73c
getUsedBytes should query the SolidFire cluster to acquire the size of the given volume if there is no volume_details info for that volume (and then create a volume_details row for this volume so we don't have to make that cluster call for this purpose again)
2015-08-12 12:24:17 -06:00
Mike Tutkowski
8b0266d12e
Merge branch 'pr/547'
...
* pr/547:
CLOUDSTACK-8601. VMFS storage added as local storage can be re-added as shared storage. Fail addition of a VMFS shared storage pool in case it has already been added as local storage in CS.
Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com>
2015-08-10 19:00:53 -06:00
Mike Tutkowski
2c8d179b7a
Renamed two variables to make them more descriptive
2015-08-05 22:43:43 -06:00
Mike Tutkowski
2cbc168822
The lowest the hypervisor snapshot reserve value can be is 10 (down from 50).
2015-08-05 15:47:57 -06:00
Daan Hoogland
a0ba7d310e
CLOUDSTACK-8656: log in case we are on a platform not supporting UTF8
2015-08-04 14:41:33 +02:00
Daan Hoogland
85e002b230
CLOUDSTACK-8656: filling empty catch block with info messages
...
using regexp "catch\s*\(\s*(Exception|Throwable)\s*\w*\)\s*\{\s*\}"
2015-07-30 15:51:52 +02:00
Likitha Shetty
13a98dd196
CLOUDSTACK-8601. VMFS storage added as local storage can be re-added as shared storage.
...
Fail addition of a VMFS shared storage pool in case it has already been added as local storage in CS.
2015-07-01 10:47:36 +05:30
Daan Hoogland
8a99df77b6
findbugs volumeInfo is known to not be null
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
This closes #515
2015-06-23 23:27:04 +02:00
Daan Hoogland
c0a1009740
findbugs: (un)boxing of long from string
2015-06-22 13:18:14 +02:00
Rafael da Fonseca
b929db1f1a
Fix findbugs DM_BOXED_PRIMITIVE_FOR_PARSING warning in ElastistorPrimaryDataStoreLifeCycle.java
...
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes #503
2015-06-22 10:54:55 +02:00
Rafael da Fonseca
a17852aaf4
Fix findbugs DM_BOXED_PRIMITIVE_FOR_PARSING warning in ElastistorUtil.java
...
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes #504
2015-06-22 10:54:19 +02:00
Rafael da Fonseca
9511831f0a
Fix 2 findbugs warnings in ElastistorUtil.java Unnecessary boxing/unboxing of long value
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This closes #429
2015-06-15 12:09:47 +03:00
Rafael da Fonseca
ea31a674a4
Fix findbugs warning in ElastistorPrimaryDataStoreLifeCycle.java Unnecessary boxing/unboxing of primitive value
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This closes #428
2015-06-15 12:09:45 +03:00
Devdeep Singh
a99c9d0e68
Implementation for the ability to disable a storage pool for provisioning
...
... of new volumes. Following changes are implemented 1. Disable or enable a pool with the
updateStoragePool api. A new 'enabled' parameter added for the same. 2. When a
pool is disabled the state of the pool is updated to 'Disabled' in the db. On
enabling it is updated back to 'Up'. Alert is raised when a pool is disabled or
enabled. 3. Updated other storage providers to also honour the disabled state.
4. A disabled pool is skipped by allocators for provisioing of new volumes. 5.
Since the allocators skip a disabled pool for provisioning of volumes, the
volumes are also not listed as a destination for volume migration.
FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Disabling+Storage+Pool+for+Provisioning
This closes #257
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-19 11:16:49 +01:00
Mike Tutkowski
bcd227fb6b
Pass on all operations to CloudStackPrimaryDataStoreDriverImpl
2015-05-07 12:24:05 -06:00
Rohit Yadav
c8901a7990
utils: use a better extended implementation of SSLSocketFactory
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b4a5a32a74 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 17:32:07 +05:30
punith-cloudbyte
ff7ef985f1
NFS support for VMware-managed storage
...
Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com>
2015-03-05 17:39:10 -07:00
Rohit Yadav
fabab5460c
CloudStackPrimaryDataStoreLifeCycleImpl: decode path as UTF8 or fallback
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 6ddaef7a48 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-05 15:28:22 +05:30
Mike Tutkowski
326a175c08
Don't allow managed (primary) storage to be deleted if it contains one or more snapshots.
2015-01-29 16:51:45 -07:00
Mike Tutkowski
c2330f48dd
Replace synchronized with the use of database locking
2015-01-27 17:36:21 -07:00
Mike Tutkowski
f23c5ded0b
Provide a more detailed snapshot name on the SAN side
2015-01-25 22:51:16 -07:00
Rohit Yadav
664186f483
CLOUDSTACK-8160: use preferable protocols
...
(cherry picked from commit debfcdef78 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-21 18:04:45 +05:30
Mike Tutkowski
b7ab955610
When deleting primary storage that's based on the SolidFireShared plug-in (which uses a shared-IOPS approach), remove the volume from the volume access group it's in
2014-12-15 17:15:40 -07:00
Rohit Yadav
fac7bfc5d5
CLOUDSTACK-8011: Upgrade maven dependencies
...
Changes;
- Upgrades maven-war plugin to 4.5 (faster war packaging)
- Upgrade spring framework to latest minor release
- Upgrade ehcache, jasypt, httpclient, httpcore and other core dependencies
- Upgrade to latest ipv6 library, fix unit test NetUtilsTest
- httpcore and httpclient are sharing same version variable
- commons-httpclient is different that httpclient, the fix gives it a separate var
- Apidocs failed to generate and get stuck with new reflections version, for now
we will continue using 0.9.8
Newer dependencies can be listed using:
mvn versions:display-dependency-updates -Dnoredist -Dsimulator -P developer,systemvm
Testing;
- Tested using Maven 3.2.1
- Local noredist build with unit tests succeeds
- CloudStack mgmt server started, basic business layer tests work
- Observed 10-15% build time improvement using new maven-war plugin
Branch: bugfix/4.5-8011 (commits are squashed in favour of a linear history)
Pull request:
https://github.com/apache/cloudstack/pull/50
This closes #50
TravisCI build summary:
https://travis-ci.org/shapeblue/cloudstack/builds/42902172
- Build passes with unit tests
- Apidocs generates successfully
- Most integration tests pass, some fail due to timeout errors, second re-run
passes some of them
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-04 02:12:51 +05:30
Laszlo Hornyak
3577423da9
removed executable flags from java classes
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-11-23 19:49:01 +01:00
Mike Tutkowski
2042660a68
Added a "long getUsedIops(StoragePool)" method to the PrimaryDataStoreDriver interface
2014-11-12 13:38:58 -07:00
Mike Tutkowski
b1915f35f8
Allow infrastructure to handle delete of volume from DB
2014-11-07 07:49:53 -07:00
Mike Tutkowski
7c5bc4ae7e
Allow infrastructure to handle delete of volume from DB
2014-11-06 22:54:20 -07:00
Hugo Trippaers
4ebaf0a583
Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT
2014-10-29 14:54:23 +01:00
Mike Tutkowski
1b5bb7d8c6
Invoke grantAccess and revokeAccess one time each using a SnapshotInfo (where previously a VolumeInfo was being passed in)
...
Handle the case where a SnapshotInfo is passed into the grantAccess and revokeAccess methods
2014-10-21 16:01:14 -06:00
Mike Tutkowski
57dacf99a2
Changed "boolean connectVolumeToHost(VolumeInfo, Host, DataStore)" to "boolean grantAccess(DataObject, Host, DataStore)"
...
Changed "void disconnectVolumeFromHost(VolumeInfo, Host, DataStore)" to "void revokeAccess(DataObject, Host, DataStore)"
2014-10-21 16:01:14 -06:00
Mike Tutkowski
b29265f159
Logic around granting and revoking access to the volume that backs the snapshot
2014-10-21 16:01:14 -06:00
Mike Tutkowski
0cea0346ae
Support for back-end snapshots on primary storage
2014-10-21 16:01:14 -06:00
Mike Tutkowski
6beeeff7d4
Logic on SolidFire side for CloudStack snapshots
2014-10-21 16:01:13 -06:00
Mike Tutkowski
06f6b00cd1
Snapshot support
2014-10-21 16:01:13 -06:00
Mike Tutkowski
e70dde09c9
Implementing snapshot-strategy support for reverting a volume to a snapshot
2014-10-14 22:04:18 -06:00
Mike Tutkowski
35a8b70799
Adding a snapshot strategy for systems that want to take snapshots that reside on their own system (as opposed to the default approach of taking a hypervisor snapshot and then copying it to secondary storage)
2014-10-14 12:26:40 -06:00
Santhosh Edukulla
350ac4c4b0
Fixed Resource Leaks
...
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-10-13 17:51:02 +05:30
Likitha Shetty
f1e3e83bbf
BUG-ID: CLOUDSTACK-7653. VM's are not getting deleted from hypervisor after deleting from UI when using zone wide primary storage.
...
While expunging a volume, CS chooses the endpoint to perform delete operation by selecting any host that has the storage containing the volume mounted on it.
Instead, if the volume to be deleted is attached to a VM, the endpoint chosen by CCP should be the host that contains the VM.
2014-09-30 15:20:15 +05:30
Mike Tutkowski
1d2f3300ad
Adding support for SolidFire snapshots
2014-09-03 20:09:00 -06:00
Hugo Trippaers
dc3f0cbc63
Improve the handling of the findbug exclude files
2014-09-03 10:41:22 +02:00
Mike Tutkowski
ef0adc1238
Removed an un-used import
2014-08-29 00:23:48 -06:00
Mike Tutkowski
08995b68e6
Name the SolidFire Volume Access Group after the UUID of the CloudStack cluster it serves
2014-08-28 23:57:52 -06:00
Mike Tutkowski
3773ff060e
Update to volume-resize logic
2014-08-21 20:18:20 -06:00
Santhosh Edukulla
c792f149fb
Build failed with checkstyle error because of unused imports, removed them
2014-08-02 14:18:38 +05:30
Edison Su
b5db68e2d1
CLOUDSTACK-7226: in case lun number is not provided, addprimarystorage cmd should report error instead of NPE
2014-08-01 16:23:30 -07:00
Hugo Trippaers
ec43bfce90
Fix false positve in coverity, simple rewrite.
2014-07-24 12:21:37 +02:00
Mike Tutkowski
08d7b46be7
Update to volume-resize logic
2014-07-19 00:42:04 -06:00
Hugo Trippaers
6c2acda5a3
Fixup licenses and enfore the license check in this plugin
2014-07-18 11:40:51 +02:00
punith-cloudbyte
f3cbb69995
first commit of improvised cloudbyte storage plugin
...
Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com>
2014-07-17 21:34:37 -06:00
Mike Tutkowski
b080eaf327
Updates to the way resizing a volume works
2014-07-17 21:09:19 -06:00
Vania Xu
8bd9e78071
Adding SolidFire API plug-in
2014-07-10 21:22:47 -06:00
Mike Tutkowski
83034907ca
Modification to the way SolidFire account info is stored in the DB
2014-07-07 22:16:58 -06:00
Hugo Trippaers
362b481176
Fix CID 1164032 Dodgy code
2014-07-04 16:48:27 +02:00
Santhosh Edukulla
a600d8408e
Fixed Resource Leaks, null dereferences, few other issues reported by coverity
2014-07-04 16:17:58 +05:30
Mike Tutkowski
c344693e48
Inform the applicable storage plug-in's life cycle that capacity (bytes and/or IOPS) can be updated
2014-06-24 14:39:57 -06:00
Damodar Reddy
d3ffb7a565
CLOUDSTACK-6444: Fixing the issue with iSCSI path Format /targetIQN/LUN.
...
Signed-off-by: Koushik Das <koushik@apache.org>
2014-06-24 10:11:44 +05:30
Mike Tutkowski
49aa13e8e1
Changed some places where "SolidFire" was written with a small "f"
2014-06-16 12:47:07 -06:00
Mike Tutkowski
42d00cae58
SolidFire (shared-access) Provider
2014-06-16 12:15:29 -06:00
Ding Yuan
c031eb7d38
CLOUDSTACK-6242: exception handling improvements
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-04-15 08:07:15 +02:00
Edison Su
25a6234a5b
fix build
2014-03-28 16:24:45 -07:00
edison
6647802d08
CLOUDSTACK-5573: bump gson version to 1.7.2, fix https://code.google.com/p/google-gson/issues/detail?id=354
2014-03-28 16:22:32 -07:00
Daan Hoogland
8b62b2cb92
findbugs: exclude known spiffy hacks a.k.a. false positives
2014-03-28 14:28:10 +01:00
Edison Su
0c1b6b44a8
add apache licence header for cloudbyte
2014-03-18 15:02:02 -07:00
Edison Su
0288a87045
pump the version
2014-03-18 11:14:23 -07:00
punith-cloudbyte
f3c7c607bd
cloudbyte storage plugin for master commit
2014-03-18 11:14:23 -07:00
Hugo Trippaers
4402685e11
Update master to 4.5.0-SNAPSHOT
2014-03-14 14:55:26 +01:00
Niels de Vos
fe83a85436
Add support for Primary Storage on Gluster using the libvirt backend
...
The support for Gluster as Primary Storage is mostly based on the
implementation for NFS. Like NFS, libvirt can address a Gluster environment
through the 'netfs' pool-type.
2014-02-20 14:52:01 +01:00
wrodrigues
0ff943337c
fixing FindBugs scariest for replaceFirst() method call that does not assign the return value
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-14 18:37:44 +01: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
Mike Tutkowski
0846bfe1ff
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-20 23:10:54 -07:00
Edison Su
3f49f8ca61
Fix RAT
2014-01-16 12:10:38 -08:00
Victor Rodionov
753b563947
NexentaStor iSCSI volume driver
...
This a NexentaStor iSCSI volume driver.
Now implemented only following functions:
* create volume
* delete volume
Currently delete volume still in progress.
Signed-off-by: Edison Su <sudison@gmail.com>
2014-01-15 15:12:48 -08:00
Mike Tutkowski
68fda5a8dd
Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)
2014-01-09 23:36:36 -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
Mike Tutkowski
8b6e89c012
Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)
2014-01-09 15:44:02 -07:00
Mike Tutkowski
a298f6fce9
Merge from 4.3: CLOUDSTACK-5468: Configuration property should be optional
2014-01-09 15:16:18 -07: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
Sanjay Tripathi
46c6b91832
CLOUDSTACK-4402: [deleteStoragePool] There is no way to delete Primary storage if the last host with which it was associated is already removed.
2013-12-27 17:12:38 +05:30
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
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