etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,208 Commits 324 Branches 325 Tags 838 MiB
Commit Graph

25208 Commits

Author SHA1 Message Date
Rohit Yadav bb14a6553d appliance: make room for /var fix systemvm build 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 23:39:31 +05:30
Rohit Yadav 8cfd374f04 CLOUDSTACK-8224: Don't try to unlock if template is not locked 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 17:43:12 +05:30
Rohit Yadav 9198859dcf appliance: before apt-get upgrade, do a clean to free-up space 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 16:59:44 +05:30
Santhosh Edukulla 78bfaa79cf Fixed few coverity issues like invalid boxing unboxing issues, resource leaks, null dereferences 
(cherry picked from commit ef6ec7b276)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 16:50:20 +05:30
Sheng Yang 405ed3ca50 CLOUDSTACK-7605: Fix basic zone multiple pod network restart with cleanup=true 
1. getRouters() doesn't handle RestartNetwork with cleanup=true for basic zone,
because pod wouldn't be specific at the time.

2. The regression caused by the following fix. The variable "routers" was
overrided with some local values, result in only one of the routers in multiple
pods would return, thus only one router would be started.

commit 6dd5c3fd42
Author: Rohit Yadav <bhaisaab@apache.org>
Date: Thu Oct 11 18:30:00 2012 +0530
CLOUDSTACK-70: Improve restart network behaviour for basic network

(cherry picked from commit aaeadc5c44)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 16:44:19 +05:30
Kishan Kavala 40e296dea4 CLOUDSTACK-7267: For LXC volumes, show unsupported operation error for template creation from ROOT volume 
(cherry picked from commit e427d0004c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 16:32:35 +05:30
Nitin Mehta 4ea0dcda9b CLOUDSTACK-7870: When Vm deployments fail and end in error state volume count should be decremented 
(cherry picked from commit a8b89bea4f)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 16:24:06 +05:30
Saksham Srivastava 54d08a8e29 CLOUDSTACK-8091: Stale entry exists for a VM NIC even after an exception while adding a new nic to vm 
(cherry picked from commit 4821bfffe2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 16:19:46 +05:30
Rohit Yadav 7d1ced7400 rabbitmq: bump up dependency lib version 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 16:07:19 +05:30
Rohit Yadav af278fe1ab Fix typos 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 15:53:41 +05:30
Jayapal 81994cf443 CLOUDSTACK-5494: Fixed dns is open to public in VR 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 15:29:57 +05:30
Rohit Yadav 671248b3e1 rc.local: add missing license header 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 14:58:21 +05:30
Rohit Yadav cf7a8cc052 CLOUDSTACK-8220: Let's have a separate XenServer 6.5 resource 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 06437dadf5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 14:45:06 +05:30
Rohit Yadav d2bf21065e DeployVmCmd: Fix NPE case 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 14:20:57 +05:30
Hugo Trippaers 82eebab0ba CID-1241966 Fix potential null deref 
(cherry picked from commit 1c94017ff6)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 18:27:09 +05:30
Rohit Yadav a4d24adfb8 CLOUDSTACK-8146: close search builder using done() 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 18:05:25 +05:30
Rohit Yadav 68b5440d44 fix NPE cases, throw exceptions early on 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 17:44:32 +05:30
Gaurav Aradhye 9658569f5a CLOUDSTACK-8124: Skipping snapshot tests on Hyper-V 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2015-02-05 17:36:11 +05:30
Gaurav Aradhye 762727439b CLOUDSTACK-8124: Skipping snapshot tests on hyperv hypervisor 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2015-02-05 17:35:36 +05:30
Rohit Yadav 78b9be07d5 Merge remote-tracking branch 'terbolous/saml2-certvalidity' into 4.5 
This closes #71

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 17:20:35 +05:30
Rohit Yadav 1cf165f86d ApiResponseHelper: fix NPE when parent of snapshot is null 2015-02-05 17:10:56 +05:30
Kishan Kavala ca0a77088c Close transaction while fetching recent events 
(cherry picked from commit 438f90a262)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 16:56:20 +05:30
Rohit Yadav fb1069ace9 agent: don't investigate if host is null, send alert instead 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 16:42:56 +05:30
Rohit Yadav 419508b016 orchestration: allow storage migration 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a2547ed827)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 16:39:17 +05:30
Kishan Kavala 7a397cd4ef For volumes created from template, do not log offering ID in VOLUME.CREATE in usage_event. Moved offering type to DiskOffering interface 
(cherry picked from commit 9eb8d538dd)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 16:37:59 +05:30
Rohit Yadav e40b06e9ca AgentAttache: allow checkonhost command in maintenance, cancel if only allowed 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 16:29:44 +05:30
Rohit Yadav 46cd98b163 jobs: fix corner cases, add NPE checks 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 16:20:47 +05:30
Hugo Trippaers 744c20bd7c CID-1249801 This should be a string comparison, not an object comparison 
(cherry picked from commit ab980cd3b7)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 16:02:24 +05:30
Erik Weber 03e07c41b5 CLOUDSTACK-8215: Change Date calculation to Joda DateTime 2015-02-05 11:31:42 +01:00
Santhosh Edukulla c25263ba81 Fixed Coverity Issues 2015-02-05 15:59:29 +05:30
Rohit Yadav b442d77dc9 Publish secstorage failure, removed by a12ab8a2b3 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 15:54:27 +05:30
Rohit Yadav 125abe8234 improve protocol enabling based on socket object type 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d62d511f47)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 15:49:01 +05:30
Hugo Trippaers 6fc97f9181 CID-1116546 Fix resource leak 
(cherry picked from commit fe0168f6d2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 15:32:08 +05:30
Likitha Shetty 7de7885a54 CLOUDSTACK-8125. VM fails to start on the first attempt after a cold migration. 
Update volume chain_info to NULL during cold migration.
Otherwise during VM start, CCP will configure and try to power-on the VM with wrong disk information.

(cherry picked from commit 7b32b8a268)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 15:30:49 +05:30
Rohit Yadav 6ddaef7a48 CloudStackPrimaryDataStoreLifeCycleImpl: decode path as UTF8 or fallback 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 15:27:45 +05:30
Damodar 01cc1b816d CLOUDSTACK-7792: Usage Events to be captured based on Volume State Machine 
(cherry picked from commit 781648fb10)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
 2015-02-05 15:22:21 +05:30
Erik Weber b84c8889a3 SAML changing date calculation 
Signed-off-by: Erik Weber <terbolous@gmail.com>
 2015-02-05 10:29:27 +01:00
Damodar 8ec6d0471c CLOUDSTACK-7648: There are new VM State Machine changes introduced which were missed to capture the usage events 
(cherry picked from commit 50185b7c3a)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2015-02-05 14:56:52 +05:30
Kishan Kavala 6541354a59 Trigger user stats aggregation job at midnight in usage aggregation timezone 
(cherry picked from commit 4ac96d637c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2015-02-05 14:33:27 +05:30
Rajesh Battala 782adc106e CLOUDSTACK-7313 Fixed issues in provisioning vpx in SDX from CS 
(cherry picked from commit 0f528df228)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 13:50:29 +05:30
Santhosh Edukulla bd190192b9 Fixed Resource Leaks 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
(cherry picked from commit 350ac4c4b0)

Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
 2015-02-05 13:47:22 +05:30
Anthony Xu 98b416b7f0 fixed NPE 
(cherry picked from commit c78f14cbc2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 12:10:09 +05:30
Rohit Yadav bf17f640c6 CLOUDSTACK-8198: Use random local storage UUID 
Earlier host addition of multiple hosts with local storage failed due to
same local storage UUID being used where the storage path is same.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-03 22:26:51 +05:30
Rohit Yadav 1172867df0 CLOUDSTACK-8195: Don't break IdP, return metadata XML 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-03 16:59:09 +05:30
Rohit Yadav 5159cbec9f appliance: get scripts only from 4.5 and not master 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-03 16:50:37 +05:30
Rohit Yadav 876c78fe1b CLOUDSTACK-8191: SAML users should have their own accounts 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-02 19:56:25 +05:30
Rohit Yadav 48ec9ac11b CLOUDSTACK-8190: Fix xenserver traffic label for backward compatiblity 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-02 16:09:56 +05:30
Anthony Xu 64e938b701 fixed NPE on calculating vm snasphot volume size 
(cherry picked from commit 95c7ffbd46)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-02 15:03:43 +05:30
Anthony Xu 86fe713ab9 don't need to check if pv driver is updated, old pv driver should work 
(cherry picked from commit 45611a0f83)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-02 15:02:31 +05:30
Likitha Shetty bf7013f0ea CLOUDSTACK-8111. NFS secondary storage repetitively mounted on CS server with ESXi hypervisors. 
Fix cleanup of NFS mounts on management server during server starup by correcting how mount points are listed for a management server.

(cherry picked from commit 647532376f)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-02 14:51:53 +05:30