aded30374a
Squashed commits
...
Signed-off-by: Tim Mackey <tmackey@gmail.com>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-05-12 03:16:06 -04:00
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
5e3d4aebac
CLOUDSTACK-6273 (Text changed slightly for a confirmation dialog)
2014-03-21 19:12:41 -06:00
15729f342c
CLOUDSTACK-6272: Fix recover/restore VM actions
...
-Label recoverVirtualMachine as 'Recover VM'
-Label restoreVirtualMachine as 'Reinstall VM'
-Change confirmation text for restoreVirtualMachine to be more explicit
-Change restoreVirtualMachine icon to 'recycle' symbol, to avoid
confusion with the reboot VM icon
2014-03-21 13:28:52 -07:00
f3c7c607bd
cloudbyte storage plugin for master commit
2014-03-18 11:14:23 -07:00
dadaf85860
CLOUDSTACK-6246: UI > Infrastructure > SSL Certificate > update (1) mouse-over hint of SSL Certificate button. (2) description in SSL Certificate dialog.
2014-03-17 15:41:48 -07:00
4402685e11
Update master to 4.5.0-SNAPSHOT
2014-03-14 14:55:26 +01:00
fa80c63c33
Removing the copy task that is not needed any more.
...
We do not need to copy commands.properties to utils anymore since the IAM permissions are no longer loaded during Upgrade
2014-03-13 14:14:12 -07:00
99bdc8d875
Merge branch 'master' into rbac.
2014-03-13 11:05:03 -07:00
3ee1fc28de
CLOUDSTACK-6217:
...
Add APIs for ability to add new guest OS types, and their hypervisor specific mappings.
The table guest_os_hypervisor is currently maintained but not used, and the APIs reuse the same
Signed off by: Nitin Mehta <nitin.mehta@citrix.com>
2014-03-12 17:03:38 -07:00
36558e4619
Corrected the value of label.no.grouping in the resource files. An extra backspace at the end of the string caused incorrect text to be shown in the Select view dropdown on Virtual Routers page: "(no grouping)\label.create.nfs.secondary.staging.storage=Create NFS Secondary Staging Store" instead of "(no grouping)"
...
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2014-03-11 11:25:18 -07:00
48e08fe676
Merge branch 'master' into rbac.
2014-03-06 14:02:20 -08:00
182c31899b
Externalized the hardcodedstrings from UI JAVASCRIPT files.
2014-03-05 14:11:51 -08:00
477902379e
Fix CLOUDSTACK-4563: Initial zone wizard UI label issue
2014-03-03 10:19:03 -08:00
3beb75cdf1
Fix typo
2014-02-27 12:59:34 +01:00
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
9f47466fea
Fix some issues in renaming iam api, also fix marvin library.
2014-02-26 17:30:34 -08:00
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
afc188cb5c
Forward port the fix by David from 0c2ad0338e
2014-02-25 15:18:16 +01:00
7aa70fe82a
Fix jetty:run startup to include the mysql driver as a dependency for developers
2014-02-25 12:30:46 +01:00
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
ac00ab0087
Cleanup all mysql dependencies and set all to provided.
2014-02-21 14:55:11 +01:00
f1139848e5
Slight optimization, don't run checkstyle on container or non-java projects.
2014-02-18 12:24:11 +01:00
e171cb181c
Fixed-Hardcoding-Issues
2014-02-14 07:44:54 -08:00
3b58a45e04
Merge branch 'master' into rbac.
2014-02-07 13:43:36 -08:00
4305d817ba
External UUID control support for PublicIpAddress/RemoteAccessVpn/PortForwardingRule/S2SVpnGateway/S2SVpnConnection
2014-02-05 15:56:40 -08:00
9641e1dbee
External UUID control support for NetworkACLList/LoadBalancer/ApplicationLoadBalancer
2014-02-05 10:36:21 -08:00
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
54f32a8e46
Moved the controlling logic for secondary storage vm into place
2014-02-05 01:39:17 +00:00
aaa20947a9
ExternalUUID control support for Firewall and Egress Firewall rules
2014-02-04 17:06:04 -08:00
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
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
748dc1541c
Support attaching policy to account.
2014-01-28 10:00:17 -08:00
33cd1ab921
Merge branch 'master' into rbac
2014-01-22 11:23:51 -08:00
929fbabaa2
Merge branch 'master' into rbac.
2014-01-17 14:37:08 -08:00
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
eb521baf49
Add Dutch (Netherlands) and Polish for UI languages
2014-01-17 11:14:52 +00:00
bd79fb33a6
CLOUDSTACK-5870: API support for retrieving user data
2014-01-16 15:31:18 -08:00
52406a8401
Rename 'Sockets' -> 'CPU Sockets'
2014-01-16 15:16:00 -08:00
6c1849f4bf
Fix Spring wiring issues in starting up MS.
2014-01-14 16:20:30 -08:00
b61f0a74ca
Centralize all eclipse m2e excludes in the main pom.xml
2014-01-14 09:39:42 +01:00
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
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
850bc9fa82
Hook the OpenDaylight plugin into CloudStack
2014-01-08 15:58:08 +01:00
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
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
afcf967d24
Revert "CLOUDSTACK-4941:"
...
This reverts commit 231e7c01f2
2013-12-18 16:01:37 -08:00
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
15a860d560
Add missing strings for LDAP section, S3 fields
2013-12-18 13:29:25 -08:00
34174bbcbb
Add missing strings for quiesce VM, SMB fields
2013-12-18 13:10:15 -08:00
Tim Mackey
Marcus Sorensen
Mike Tutkowski
Brian Federle
punith-cloudbyte
Jessica Wang
Hugo Trippaers
Prachi Damle
Min Chen
amogh.vasekar
Mihaela Stoica
vetrivelc
Gabor Apati-Nagy
Konstantina Chremmou
Niels de Vos
Alena Prokharchyk
Syed Ahmed
Alex Huang
Hiroaki KAWAI
Milamber
Brian Federle
Murali Reddy
Nitin Mehta