etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,061 Commits 323 Branches 325 Tags 953 MiB
Commit Graph

22061 Commits

Author SHA1 Message Date
edison bd335d01cb fix devcloud reboot issue: should not start heartbeat for devcloud 2014-02-06 14:19:29 -08:00
Min Chen 8f63c2cf9c CLOUDSTACK-6017: NPE while creating snapshot multiple times on same Root 
volume with S3 as secondary storage.
(cherry picked from commit 402254337c)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-02-03 14:05:20 -08:00
David Grizzanti 91ec548fc0 CLOUDSTACK-5062: Deleting Load Balancing Rule fails when generating 
usage events are enabled

Signed-off-by: Daan Hoogland <daan@onecht.net>(cherry picked from commit 62a259ffa9)
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-02-02 16:10:35 -08:00
Sanjay Tripathi c0e70b51fc CLOUDSTACK-5566: "Entity com.cloud.event.EventVO$$EnhancerByCGLIB$$9e317420@aeb3d75 
and entity com.cloud.event.EventVO$$EnhancerByCGLIB$$9e317420@5a0fd1ec belong to
different accounts"  message while deleting multiple events .
(cherry picked from commit b811bc0945)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-02-02 16:09:52 -08:00
Likitha Shetty 5480a810a6 CLOUDSTACK-6002. [vCenter 5.5] restoreVM fails with ROOT-x-000001.vmdk not found. 
(cherry picked from commit ba5b302ae6)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-02-02 16:08:56 -08:00
Marcus Sorensen 631ea240f4 CLOUDSTACK-6000: When expunging fails, move volume state back to 
Destroy, so that the cleanup thread will try again on next run.
(cherry picked from commit 1aa1b3e19c)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-02-02 16:06:36 -08:00
Koushik Das 4809d91c51 CLOUDSTACK-5993: Cloud agent fails to start on 32-bit system vms (cpvm and ssvm) created with 4GB RAM offering 
Capped the max heap size of the JVM at 2600M for 32-bit system VMs. For 64-bit, existing logic works fine.
(cherry picked from commit 1ae02009b5)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-02-02 16:06:14 -08:00
Hiroaki KAWAI 9961a8e710 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
(cherry picked from commit db3dc2ee17)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-02-02 16:03:11 -08:00
Hiroaki KAWAI eece5100f0 Fix mock socket client/server test. 
Normally a server will bind to 0.0.0.0, which is not an
address that a client can specify to connect to.
127.0.0.1 or ::1 will do.
(cherry picked from commit 1e9f066df2)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-02-02 16:02:35 -08:00
Daan Hoogland a42a345684 findbugs replaced byte[].toString() with new String(byte[]) 2014-02-02 19:50:58 +01:00
Daan Hoogland 438a4b0d5a Revert "findbugs replaced byte[].toString() with Arrays.toString(byte[])(cherry picked from commit ce7c6d2357)" 
This reverts commit 55ec8f3a2d.
 2014-02-02 19:38:49 +01:00
Daan Hoogland 8c45ab0761 findbugs Long comparison == -> equals() 
(cherry picked from commit f4db8df66f)

Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-01-31 19:17:58 +01:00
Daan Hoogland 6aa3fd8a81 findbugs get from map with proper key-type 
(cherry picked from commit a4f2f0b39f)

Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-01-31 19:17:21 +01:00
Daan Hoogland 5d11f9b149 findbugs explicit toString on enum for call get(Object) 
(cherry picked from commit cce4a055ae)

Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-01-31 19:16:55 +01:00
Daan Hoogland 92ac450ca0 findbugs get proper object from map 
(cherry picked from commit 901cf8ab32)

Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-01-31 19:16:30 +01:00
Daan Hoogland f5f22c9d3b findbugs: assign result of string manipulations 
(cherry picked from commit 20127e09dc)

Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-01-31 19:15:55 +01:00
Sanjay Tripathi a5f73b7285 CLOUDSTACK-5900: Failed to delete template/ISO that failed to download. 
(cherry picked from commit 8024f2cc70)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-01-30 18:12:15 -08:00
Sanjay Tripathi 16dbb20b5d CLOUDSTACK-5900: Failed to delete template/ISO that failed to download. 
(cherry picked from commit ae22d1990e)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-01-30 18:11:47 -08:00
Likitha Shetty e089b91385 CLOUDSTACK-5994. Hitting IndexOutOfBoundsException in GetVmStatsCommand after upgrade. 
To obtain network read/write statistics, multiply sample duration with the
average of the particular performance metric obtained over the sample period.
(cherry picked from commit 16c3f53793)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-01-30 17:59:37 -08:00
Jessica Wang 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)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-01-30 17:59:04 -08:00
Alena Prokharchyk a31eccc405 Fixed API doc that got broken by adding new commands for stratosphere ssp plugin 
(cherry picked from commit 54f2234e21)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-01-30 17:58:30 -08:00
Daan Hoogland 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
Animesh Chaturvedi 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
Koushik Das 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)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-01-30 17:54:50 -08:00
Sanjay Tripathi d7e1d38d48 CLOUDSTACK-5660: Migrate vm live migration succeeds but throws error as "Failed to migrate the system vm". 
(cherry picked from commit cff312ef74)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-01-30 17:44:48 -08:00
Jayapal ccc8aa78cd CLOUDSTACK-5966 Updated service monitoring config to start by default. 
Global settings EnableServiceMonitoring param set to true
(cherry picked from commit 7255e50f20)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-01-30 17:42:42 -08:00
Jayapal bbe62ea134 CLOUDSTACK-5966 Update the schema-421-430.sql for EnableServiceMonitoring global setting 
(cherry picked from commit 888b906776)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-01-30 17:42:21 -08:00
Sheng Yang 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)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-01-30 17:40:17 -08:00
Alena Prokharchyk 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)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-01-30 17:39:28 -08:00
Animesh Chaturvedi 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
Jessica Wang 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)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-01-29 15:57:01 -08:00
Daan Hoogland d6bbfbbc59 findbugs: nullpointer guards and wrappertype comparisons 2014-01-29 21:44:06 +01:00
Daan Hoogland dcda79e2c0 Findbugs: different issues solved 2014-01-29 21:40:21 +01:00
Daan Hoogland 1fb32b58eb findbugs: null-checks 2014-01-29 21:39:11 +01:00
Daan Hoogland eb239b9689 findbugs: retrieve the objects to remove from the collection(s) 2014-01-29 21:38:40 +01:00
Daan Hoogland 594fd42d5d findbugs fixes for ApiServer, ApiSerializerHelper and ApiXmlDocWriter 2014-01-29 21:36:46 +01:00
Daan Hoogland c3a63b6b5a Findbugs issues in ApiResponseHelper fixes 2014-01-29 21:31:54 +01:00
Ian Duffy 9776e1af1c Fix findbug issues within LDAP authenticator 2014-01-29 21:31:12 +01:00
Daan Hoogland da344bb234 restored imports 2014-01-29 21:29:50 +01:00
Daan Hoogland 30b7fa5919 moved call on static object to synchronized block 2014-01-29 21:28:25 +01:00
Daan Hoogland 5296c12d2a nullpointer dereference guarded 2014-01-29 21:27:49 +01:00
Hugo Trippaers da80eafec9 Backport findbugs configuration to 4.3 so we can run a findbugs report in jenkins. 2014-01-29 21:26:45 +01:00
Alena Prokharchyk 2311528f18 CLOUDSTACK-5983: changed responseName param in assignCertToLoadBalancer and removeCertFromLoadBalancer API commands 2014-01-29 11:45:00 -08:00
Marcus Sorensen 66d0b3d45b CLOUDSTACK-5968 create vm.memballoon.disable agent parameter 
(cherry picked from commit 661a19bde3)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-01-28 15:06:54 -08:00
Marcus Sorensen 7ca27f6cc6 CLOUDSTACK-5968 create vm.memballoon.disable agent parameter 
(cherry picked from commit e624632dfd)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-01-28 14:58:57 -08:00
Daan Hoogland 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
Hugo Trippaers 220a2a1a0e Backport fixed for issues found by Findbugs 
(cherry picked from commit 60ac12780b)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-01-28 14:14:44 -08:00
Hugo Trippaers 1be40d6926 Findbugs finding : Incorrect use of equality 
(cherry picked from commit 10cc5645e8b9713bc7c86d543413d396ce203cc6)
(cherry picked from commit f18c5a1910)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-01-28 14:12:10 -08:00
Min Chen fd391845cf CLOUDSTACK-5971:Templates created from a snapshots can't be copied to 
other zones.(cherry picked from commit 77aeb2871b)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-01-28 13:32:11 -08:00
Jayapal 63e839c0f8 CLOUDSTACK-5966 Added enable/disable monitoring service in global config 
(cherry picked from commit 782265e713)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
 2014-01-28 13:31:37 -08:00