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

29860 Commits

Author SHA1 Message Date
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 7c41a1184c 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:13 +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
Rohit Yadav a2547ed827 orchestration: allow storage migration 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 16:38:53 +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 61dfb2d625 AgentAttache: allow checkonhost command in maintenance, cancel if only allowed 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 16:29:03 +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
Rohit Yadav 0afec010b8 jobs: fix corner cases, add NPE checks 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 16:20:08 +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 d5538fbe3b Publish secstorage failure, removed by a12ab8a2b3 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 15:55:13 +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
Gaurav Aradhye 82b6c1377b CLOUDSTACK-8213: Fixed typo in test_lb_secondary_ip.py 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2015-02-05 15:50:51 +05:30
Gaurav Aradhye 8354d4a765 CLOUDSTACK-8214: test_netscaler_nw_off.py - Skip test if enough zones are not present instead of throwing exception 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2015-02-05 15:50:51 +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
Rohit Yadav d62d511f47 improve protocol enabling based on socket object type 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 15:48:21 +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 fabab5460c CloudStackPrimaryDataStoreLifeCycleImpl: decode path as UTF8 or fallback 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 6ddaef7a48)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 15:28:22 +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
Rohit Yadav d4663df7c9 Make volume deletion publish event, removed by 781648fb10 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 15:01:39 +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
Daan Hoogland a2ddabde06 Merge branch 'feature/minvrversion' of https://github.com/DaanHoogland/cloudstack 2015-02-04 21:51:15 +01:00
Mike Tutkowski 6cd2b53790 Adding in the license text 2015-02-03 18:22:18 -07:00
Marcus Sorensen ca2c3c30e2 Dynamic storage adaptor for KVM 2015-02-03 12:08:24 -07:00
Rohit Yadav d5db87f381 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>
(cherry picked from commit bf17f640c6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-03 22:36:46 +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
Chandan Purushothama cfc0e12432 CLOUDSTACK-7745: Fixed the script 'test_ssvm.py' - Private IP of System VMs can change on systemVMs reboot 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2015-02-03 18:18:25 +05:30
Ashutosh K dbe9d93ec6 CLOUDSTACK-8153: Adding global setting value check for few test cases in test_custom_hostname.py 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2015-02-03 17:58:42 +05:30
Abhinav Roy f2ea617238 Correcting a minor typo in test_deploy_vgpu_vm.py script 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2015-02-03 17:57:33 +05:30
Daan Hoogland b586439c9f CLOUDSTACK-8197 create MinVRVersion config item 2015-02-03 13:18:15 +01:00
Rohit Yadav 008911d4b1 CLOUDSTACK-8195: Don't break IdP, return metadata XML 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 1172867df0)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-03 17:05:29 +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 552f2ae60c CLOUDSTACK-8191: SAML users should have their own accounts 
(cherry picked from commit 876c78fe1b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-02 19:58:10 +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 2f6691c6b9 CLOUDSTACK-8190: Fix xenserver traffic label for backward compatiblity 
(cherry picked from commit 48ec9ac11b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	ui/scripts/system.js
 2015-02-02 16:20:50 +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