etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/client/tomcatconf
History
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
..
catalina.policy.in Source code committed 2010-08-11 09:13:29 -07:00
catalina.properties.in Source code committed 2010-08-11 09:13:29 -07:00
classpath.conf.in CLOUDSTACK-2758: touch file for tomcat6 package change CVS 2013-1976 2013-06-05 17:00:47 +05:30
cloudmanagementserver.keystore.in CLOUDSTACK-5042: change cloud.keystore to cloudmanagementserver.keystore and install it (cherry picked from commit de448ec479) 2013-11-08 09:00:29 +01:00
commands.properties.in CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API 2013-12-04 10:05:46 -08:00
context.xml.in Source code committed 2010-08-11 09:13:29 -07:00
db.properties.in CLOUDSTACK-4916: Fixing the issue with DB HA when there are more than 2 db nodes (Issue was mysql DriverManager was returning salve db nodes on random basis which was causing issue) 2013-11-14 11:10:48 +05:30
ehcache.xml.in License header update for the client folder 2012-08-01 13:49:10 -04:00
environment.properties.in Added Mock ApiServer, Regions API calls with api keys 2012-10-17 14:16:36 +05:30
log4j-cloud.xml.in Spring Modularization 2013-10-02 15:41:04 -07:00
logging.properties.in Source code committed 2010-08-11 09:13:29 -07:00
server-nonssl.xml.in api: Enable UTF-8 URI encoding for tomcat 2012-12-17 20:43:37 -08:00
server-ssl.xml.in tomcat: Change some /etc/cloud paths to /etc/cloudstack 2013-03-31 14:16:31 +02:00
tomcat-users.xml.in Source code committed 2010-08-11 09:13:29 -07:00
tomcat6-nonssl.conf.in CLOUDSTACK-243: On management server, security for remote JMX connections is disabled Disabled JMX connections for both local and remote 2013-10-23 15:15:02 -07:00
tomcat6-ssl.conf.in CLOUDSTACK-243: On management server, security for remote JMX connections is disabled Disabled JMX connections for both local and remote 2013-10-23 15:15:02 -07:00
web.xml.in Source code committed 2010-08-11 09:13:29 -07:00