30b7fa5919
moved call on static object to synchronized block
2014-01-29 21:28:25 +01:00
5296c12d2a
nullpointer dereference guarded
2014-01-29 21:27:49 +01:00
da80eafec9
Backport findbugs configuration to 4.3 so we can run a findbugs report in jenkins.
2014-01-29 21:26:45 +01:00
2311528f18
CLOUDSTACK-5983: changed responseName param in assignCertToLoadBalancer and removeCertFromLoadBalancer API commands
2014-01-29 11:45:00 -08:00
66d0b3d45b
CLOUDSTACK-5968 create vm.memballoon.disable agent parameter
...
(cherry picked from commit 661a19bde3
2014-01-28 15:06:54 -08:00
7ca27f6cc6
CLOUDSTACK-5968 create vm.memballoon.disable agent parameter
...
(cherry picked from commit e624632dfd
2014-01-28 14:58:57 -08:00
85868d81fb
findbugs: null check for gateway and netmask instead of gateway twice(cherry picked from commit d30ddf6d59)
...
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-28 14:23:03 -08:00
220a2a1a0e
Backport fixed for issues found by Findbugs
...
(cherry picked from commit 60ac12780b
2014-01-28 14:14:44 -08:00
1be40d6926
Findbugs finding : Incorrect use of equality
...
(cherry picked from commit 10cc5645e8b9713bc7c86d543413d396ce203cc6)
(cherry picked from commit f18c5a1910
2014-01-28 14:12:10 -08:00
fd391845cf
CLOUDSTACK-5971:Templates created from a snapshots can't be copied to
...
other zones.(cherry picked from commit 77aeb2871b
2014-01-28 13:32:11 -08:00
63e839c0f8
CLOUDSTACK-5966 Added enable/disable monitoring service in global config
...
(cherry picked from commit 782265e713
2014-01-28 13:31:37 -08:00
3fa300b132
CS-5950: Wrong storage tags are used for ISO deployed VMs.
...
(cherry picked from commit 1f4e2a51a4
2014-01-28 13:25:14 -08:00
d4a3f7be81
CLOUDSTACK-5796. [VMware] Size column is not getting updated in snapshot_store_ref table when a snapshot is backed up in secondary storage.
...
Calculate and update the size of a backed up snapshot. This snapshot size is in turn used to update the secondary_storage count for an account.
(cherry picked from commit e8ba2d0850
2014-01-28 13:23:34 -08:00
ce1b393f73
CLOUDSTACK-5942: The agent at places logs the password of the user. It should mask the
...
password from the message string before writing to the log. Made a change to do so.
(cherry picked from commit 6d997bd689
2014-01-27 19:54:01 -08:00
7e8b8e6cd0
CLOUDSTACK-5960: Domain admin or user cannot register a template using
...
S3/Swift object store.(cherry picked from commit 6d1475182c
2014-01-27 19:52:06 -08:00
8d1d0c54f2
CLOUDSTACK-5949: Remove unused field vnc_password from user_vm_view
...
Removed unused field. This will ensure that list VM queries are not blocked.
(cherry picked from commit 3fae917ebe
2014-01-27 19:51:04 -08:00
35d0c87f9d
CLOUDSTACK-5614: UI - Infrastructure > Sockets > listView > (1) split "XenServer" into "XenServer 6.2.0" and "XenServer"(prior to 6.2.0).
...
(2) change label of Hyperv to Hyper-V.
(cherry picked from commit 81a83b5b31
2014-01-27 19:41:50 -08:00
43d485c92d
Revert "CLOUDSTACK-5923: CS doesn't do master switch for XS any more, CS will depend on XS HA to do master switch, XS HA needs to be enabled."
...
This reverts commit af5f3d5676
2014-01-22 15:07:47 -08:00
aa6f4dc8a7
CLOUDSTACK-5930: Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased
...
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Conflicts:
plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java
plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java
plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java
server/src/com/cloud/server/auth/UserAuthenticator.java
server/src/com/cloud/user/AccountManagerImpl.java
(cherry picked from commit f160b31f51
2014-01-22 13:07:43 -08:00
7125ac7382
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
...
(cherry picked from commit 0679af3434
2014-01-22 13:07:16 -08:00
c14941edf8
CLOUDSTACK-5927. Storage garbage collector is trying to destroy the SSVM/CPVM root disk that is in use.
...
In case of VMware VM during root volume preparation if we are switching to a new volume, force expunge root disk that was created from the old template.
Because otherwise storage garbage collector will later try to expunge the old disk marked for expunge and fail with 'Cannot delete file' exception
since in VMware the new root vmdk has the same name and is now in use.
(cherry picked from commit 94ea2736f4
2014-01-22 13:05:46 -08:00
e53a9d9c56
Added required dependancy to agent setup.
...
(cherry picked from commit 78f62c6347
2014-01-22 13:04:06 -08:00
2f2a2dcd46
CLOUDSTACK-5924: updating regex to get vm names exactly from ebtables chains
2014-01-22 11:24:23 +05:30
d5e0dcd2a7
Revert "Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased"
...
This reverts commit 7884bb8aaf
2014-01-21 19:50:46 -08:00
361aaca794
Pom.xml script updater erroneously removed SNAPSOT from XAPI dependency causing build failure
2014-01-21 19:02:31 -08:00
7884bb8aaf
Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased
...
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Conflicts:
plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java
plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java
plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java
server/src/com/cloud/server/auth/UserAuthenticator.java
server/src/com/cloud/user/AccountManagerImpl.java
2014-01-21 18:09:15 -08:00
af5f3d5676
CLOUDSTACK-5923: CS doesn't do master switch for XS any more, CS will depend on XS HA to do master switch, XS HA needs to be enabled.
2014-01-21 17:55:56 -08:00
70ba92fc14
Updating pom.xml version numbers for release 4.3.0
...
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-21 17:29:51 -08:00
0e79dd7af4
Updating release files for RC build
2014-01-21 17:10:13 -08:00
f431266429
CLOUDSTACK-5922:Incorrect handling RHEL guests in Vmware.
2014-01-21 16:07:12 -08:00
afb8a79321
CLOUDSTACK-5921: S3 security key is stored in DB unencrypted
2014-01-21 14:17:30 -08:00
28b5d0a9ed
CLOUDSTACK-5883 Convert ovf file to proper format for ESXi
...
Virtualbox export creates an OVF file that is not compatible with VMware import functions. This causes import errors when the systemvm ova is imported into cloudstack. This patch fixes the issue by using an XSLT transformation to convert the generated ovf into a format this is compatible with vmware.
This is a squashed commit Based on the following commits in master:
794d47c5f2bf26efc5515d24843ef595a92ad2e3da8ee45a2450054fe06050054fe060ecf57c368a
2014-01-21 08:18:33 +01:00
7c4831df92
CLOUDSTACK-5884 make getTargetSwitch(NicTO nicTo) do all the work to select switch name, type and vlan token. Change preference to use the tags set on the physical network.
2014-01-21 08:18:21 +01:00
413c61b519
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-20 23:08:27 -07:00
1b064515ac
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.
2014-01-20 17:15:23 -08:00
8db0d83d1a
CLOUDSTACK-5358: Bring back concurrency control in sync-queue management
2014-01-20 16:53:33 -08:00
cd8501e263
CLOUDSTACK-5889: UI > Instances > (1) change service offering action: corresonding UI change for new change of scaleVirtualMachine API (that customparameter parameter has been renamed).
...
(2) detailView: add # of CPU Cores, CPU (in MHz), Memory (in MB).
2014-01-20 16:29:37 -08:00
aa2d25bf92
CLOUDSTACK-5913:API rate limiting throws a different error than expected
...
when Throttle limit hit in the API.
2014-01-20 14:57:48 -08:00
27fd490885
CLOUDSTACK-5329: stupid java box/unbox
2014-01-20 10:43:32 -08:00
0e053668b8
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-18 12:36:53 -07:00
3eca162c26
mischanged default user vm template url for xen
2014-01-17 15:45:58 -08:00
7c2449dabd
CLOUDSTACK-5432:sync vm and storage commands on mgt server for kvm
2014-01-17 15:23:43 -08:00
c2902db0b1
CLOUDSTACK-5895: CreateVolumeFromSnapshot can fail in a multiple pod environment with tagged storagepool
...
Changes:
After finding the storagepool suitable to create the volume, we should not look for more pods
2014-01-17 14:05:22 -08:00
67bb66e546
CLOUDSTACK-5656: UI > Network > IP Address > configuration tab > Firewall > add "State" column.
2014-01-17 12:12:07 -08:00
ff0ac49111
CLOUDSTACK-5656: UI > Network > IP Address > configuration tab > Load Balancing > add "State" column.
2014-01-17 11:51:41 -08:00
b52e8028e9
only send stop command when agent reports VM running and CS thinks it is stopped.
2014-01-17 11:48:27 -08:00
be0d688511
CLOUDSTACK-5731: Use general instance type to categorize VM work jobs to correctly serialize VM operations
2014-01-17 10:42:04 -08:00
f1b1571145
Revert "updating the jre to version 7 on system vms"
...
This reverts commit fc2e7ec70a
2014-01-17 22:24:12 +05:30
fa6536152a
Revert "update packages list before getting jre 7"
...
This reverts commit 5121f8cd4e
2014-01-17 17:35:51 +01:00
5121f8cd4e
update packages list before getting jre 7
2014-01-17 21:15:51 +05:30
Daan Hoogland
Hugo Trippaers
Alena Prokharchyk
Marcus Sorensen
Min Chen
Jayapal
Sanjay Tripathi
Likitha Shetty
Devdeep Singh
Koushik Das
Jessica Wang
Anthony Xu
Mike Tutkowski
Alex Hitchins
Animesh Chaturvedi
edison
Kelven Yang
Jessica Wang
Prachi Damle
Abhinandan Prateek