32fd3b837c
CLOUDSTACK-5996: UI - In project view, the first listRotuers API(without projectid=-1) will return the same objects as the second listRouters API(with projectid=-1), because in project view, all API calls are appended with projectid=[projectID]. Therefore, we only call the second listRouters API(with projectid=-1) in non-project view.
...
(cherry picked from commit 713240baef
2014-01-30 17:59:04 -08:00
a31eccc405
Fixed API doc that got broken by adding new commands for stratosphere ssp plugin
...
(cherry picked from commit 54f2234e21
2014-01-30 17:58:30 -08:00
55ec8f3a2d
findbugs replaced byte[].toString() with Arrays.toString(byte[])(cherry picked from commit ce7c6d2357)
...
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 17:57:50 -08:00
602faecafe
Revertng based on mail thread discussion "Fix findbug issues within LDAP authenticator"
...
This reverts commit 92b4f66d73
2014-01-30 17:55:39 -08:00
523cbdda68
CLOUDSTACK-5989: Trying to start a vm while 'vm snapshot' is in progress results in inconsistency
...
The fix is to fail the start operation if a vm snapshot is in progress
(cherry picked from commit 775fa0f0d0
2014-01-30 17:54:50 -08:00
d7e1d38d48
CLOUDSTACK-5660: Migrate vm live migration succeeds but throws error as "Failed to migrate the system vm".
...
(cherry picked from commit cff312ef74
2014-01-30 17:44:48 -08:00
ccc8aa78cd
CLOUDSTACK-5966 Updated service monitoring config to start by default.
...
Global settings EnableServiceMonitoring param set to true
(cherry picked from commit 7255e50f20
2014-01-30 17:42:42 -08:00
bbe62ea134
CLOUDSTACK-5966 Update the schema-421-430.sql for EnableServiceMonitoring global setting
...
(cherry picked from commit 888b906776
2014-01-30 17:42:21 -08:00
6f7653d56a
CLOUDSTACK-5986: Make dnsmasq handle dnsmasq.leases when dhcp_release is available
...
The original issue has been exposed due to CloudStack VR would modify the
dnsmasq.leases, thus make it unsync with dnsmasq's memory lease.
Make the modification to let dnsmasq handle the lease file if dhcp_release is
available.
(cherry picked from commit 441d02dd40
2014-01-30 17:40:17 -08:00
45e45b930a
LOUDSTACK-5987: when listTemplates with filter=community/featured, get public templates from all domains in the system, not just parent/child subdomains of the caller
...
Conflicts:
server/src/com/cloud/api/query/QueryManagerImpl.java
(cherry picked from commit b1d4c06ad1
2014-01-30 17:39:28 -08:00
210b19c1f5
Reverting this change as it caused issues with userVmResponse. "Findbugs: different issues solved"
...
This reverts commit dcda79e2c0
2014-01-30 15:33:31 -08:00
2f2adad508
CLOUDSTACK-5970: UI > network menu > guest network section > select non-VPC isolated network with SourceNAT enabled > IP Address section > select sourceNAT IP > show Configuration tab.
...
(cherry picked from commit 1ad7bce69b
2014-01-29 15:57:01 -08:00
d6bbfbbc59
findbugs: nullpointer guards and wrappertype comparisons
2014-01-29 21:44:06 +01:00
dcda79e2c0
Findbugs: different issues solved
2014-01-29 21:40:21 +01:00
1fb32b58eb
findbugs: null-checks
2014-01-29 21:39:11 +01:00
eb239b9689
findbugs: retrieve the objects to remove from the collection(s)
2014-01-29 21:38:40 +01:00
594fd42d5d
findbugs fixes for ApiServer, ApiSerializerHelper and ApiXmlDocWriter
2014-01-29 21:36:46 +01:00
c3a63b6b5a
Findbugs issues in ApiResponseHelper fixes
2014-01-29 21:31:54 +01:00
9776e1af1c
Fix findbug issues within LDAP authenticator
2014-01-29 21:31:12 +01:00
da344bb234
restored imports
2014-01-29 21:29:50 +01:00
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
Jessica Wang
Alena Prokharchyk
Daan Hoogland
Animesh Chaturvedi
Koushik Das
Sanjay Tripathi
Jayapal
Sheng Yang
Daan Hoogland
Ian Duffy
Hugo Trippaers
Marcus Sorensen
Min Chen
Likitha Shetty
Devdeep Singh
Anthony Xu
Mike Tutkowski
Alex Hitchins