apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 10:32:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,919 Commits 312 Branches 325 Tags
Commit Graph

1471 Commits

Author SHA1 Message Date
Hugo Trippaers
3beb75cdf1 Fix typo 2014-02-27 12:59:34 +01:00
Hugo Trippaers
a0f932437c Move mysql ha strategy to a plugin. Activate this plugin using the mysqlha profile or the noredist flag 2014-02-27 09:51:02 +01:00
Min Chen
9f47466fea Fix some issues in renaming iam api, also fix marvin library. 2014-02-26 17:30:34 -08:00
Konstantina Chremmou
f05fb9fb61 Fixed some resource files issues, namely 1) invalid text and duplicate keys resulting from bad merge and 2) trailing spaces which can potentially cause UI issues. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Reviewed-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-02-25 22:05:06 +01:00
Hugo Trippaers
afc188cb5c Forward port the fix by David from 0c2ad0338e34f6117cecc24ec00c7746dd481465 2014-02-25 15:18:16 +01:00
Hugo Trippaers
7aa70fe82a Fix jetty:run startup to include the mysql driver as a dependency for developers 2014-02-25 12:30:46 +01:00
Niels de Vos
c02197ae86 Add Gluster to the list of protocols in the Management Server 
Gluster can now be used for Primary Storage just like NFS. This change adds the
Gluster protocol to the Management Server:

    Infrastructure -> Primary Storage -> Add Primary Storage

And also add the option to create Primary Storage on Gluster when
following the 'Add Zone' wizard from:

    Infrastructure -> Zones -> Add Zone

Some screenshots and verification:
- http://blog.nixpanic.net/2013/12/using-gluster-as-primary-storage-in.html
 2014-02-25 12:08:46 +01:00
Hugo Trippaers
ac00ab0087 Cleanup all mysql dependencies and set all to provided. 2014-02-21 14:55:11 +01:00
Hugo Trippaers
f1139848e5 Slight optimization, don't run checkstyle on container or non-java projects. 2014-02-18 12:24:11 +01:00
vetrivelc
e171cb181c Fixed-Hardcoding-Issues 2014-02-14 07:44:54 -08:00
Min Chen
3b58a45e04 Merge branch 'master' into rbac. 2014-02-07 13:43:36 -08:00
Alena Prokharchyk
4305d817ba External UUID control support for PublicIpAddress/RemoteAccessVpn/PortForwardingRule/S2SVpnGateway/S2SVpnConnection 2014-02-05 15:56:40 -08:00
Alena Prokharchyk
9641e1dbee External UUID control support for NetworkACLList/LoadBalancer/ApplicationLoadBalancer 2014-02-05 10:36:21 -08:00
Syed Ahmed
356daf3eed Review 16080 Move Netscaler plugin from non-oss to oss and upgrade the nitro API to 10.1 
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2014-02-05 14:03:49 +01:00
Alex Huang
54f32a8e46 Moved the controlling logic for secondary storage vm into place 2014-02-05 01:39:17 +00:00
Alena Prokharchyk
aaa20947a9 ExternalUUID control support for Firewall and Egress Firewall rules 2014-02-04 17:06:04 -08: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
Hiroaki KAWAI
cb048f4108 Some rework stratosphere ssp plugin 
* add missing command entry in commands.properties
* migrate httpclient 3.x to 4.x
* fix the broken SspClient
* add webapp session checking in mock ssp server
 2014-01-30 21:31:44 +09:00
Min Chen
748dc1541c Support attaching policy to account. 2014-01-28 10:00:17 -08:00
Min Chen
33cd1ab921 Merge branch 'master' into rbac 2014-01-22 11:23:51 -08:00
Min Chen
929fbabaa2 Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
Milamber
cb7b1dc276 Add Dutch (Netherlands, Polish languages in Web UI Change Japanese code (ja -> ja_JP) Update transifex sync config 
Conflicts:
	client/WEB-INF/classes/resources/messages_es.properties
	client/WEB-INF/classes/resources/messages_pt_BR.properties
 2014-01-17 11:15:09 +00:00
Milamber
eb521baf49 Add Dutch (Netherlands) and Polish for UI languages 2014-01-17 11:14:52 +00:00
Alena Prokharchyk
bd79fb33a6 CLOUDSTACK-5870: API support for retrieving user data 2014-01-16 15:31:18 -08:00
Brian Federle
52406a8401 Rename 'Sockets' -> 'CPU Sockets' 2014-01-16 15:16:00 -08:00
Min Chen
6c1849f4bf Fix Spring wiring issues in starting up MS. 2014-01-14 16:20:30 -08:00
Hugo Trippaers
b61f0a74ca Centralize all eclipse m2e excludes in the main pom.xml 2014-01-14 09:39:42 +01:00
Min Chen
649d9d927f CLOUDSTACK-5840:Migration from NFS to S3 should be done in one API 
(updateCloudToUseObjectStore) instead of two APIs.
 2014-01-08 17:25:13 -08:00
Hugo Trippaers
612a41e3f5 Add UI interface for managing the OpenDaylight provider and controllers. 
Fix several bugs in the code related to the api handling.

Conflicts:
	ui/scripts/system.js

ui
 2014-01-08 17:08:37 +01:00
Hugo Trippaers
850bc9fa82 Hook the OpenDaylight plugin into CloudStack 2014-01-08 15:58:08 +01:00
Murali Reddy
3a6fcaf1fc CLOUDSTACK-5787: support in-memroy eventbus 
this checkin adds support for plug-in that provides an in memory event
bus which could be used as alternative to RabbitMQ based event bus. Both
publisher are subscriber should be running with management server to use
in-memroy event bus.
 2014-01-06 13:24:36 +05:30
Nitin Mehta
1c0b8db01b CLOUDSTACK-4941: 
Adding the missing file
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
 2013-12-18 16:27:20 -08:00
Min Chen
afcf967d24 Revert "CLOUDSTACK-4941:" 
This reverts commit 231e7c01f2415c1f25d6a2715b7469fe7fcfe771.
 2013-12-18 16:01:37 -08:00
Nitin Mehta
231e7c01f2 CLOUDSTACK-4941: 
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
 2013-12-18 14:58:37 -08:00
Brian Federle
15a860d560 Add missing strings for LDAP section, S3 fields 2013-12-18 13:29:25 -08:00
Brian Federle
34174bbcbb Add missing strings for quiesce VM, SMB fields 2013-12-18 13:10:15 -08:00
tuna
ccfe557329 delete old applicationContext 2013-12-10 11:49:10 +07:00
tuna
dc151115be AutoScaling without NetScaler 2013-12-10 10:35:55 +07:00
Will Stevens
c60a256ebd fixed egress rules for palo alto plugin and cleaned up extra api calls on master 
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
 2013-12-09 18:26:57 -08:00
tuna
61e80f030a remove unused code 2013-12-09 23:33:15 +07:00
tuna
0624fe5d03 remove unused table: ovs_nic_map 2013-12-09 23:33:15 +07:00
tuna
3df8b912fc add kvm support & LB service 2013-12-09 23:33:14 +07:00
tuna
d935d3865a tuna 2013-12-09 23:33:14 +07:00
Tuna
4e914b7087 re-factor gre controller 
Signed-off-by: tuna <ng.tuna@gmail.com>
 2013-12-09 23:33:14 +07:00
tuna
96188a3730 re-factor gre controller prototype 2013-12-09 23:33:14 +07:00
Jessica Wang
619f0a9c7f UI > check in updated translation files for Siva Nata Sekhar Golla. 2013-12-05 16:55:48 -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
Jan-Arve Nygård
de2c4ceeb9 Fixed typo 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2013-11-27 14:16:25 +01:00
Wei Zhou
8b237eb0a2 CLOUDSTACK-4505: allow domain admin to expunge a destroyed VM 2013-11-26 15:02:44 +01:00
Hugo Trippaers
cf715ff491 Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01:00