25221 Commits

Author SHA1 Message Date
Rohit Yadav
9de521f390 rhel7: fix service name
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-18 16:29:24 +05:30
ramamurtis
206be251ae CLOUDSTACK-8245: Scrolling down the network service providers list from the UI never ends
(cherry picked from commit 2e5c1614ed42227b2a9242e04c8a2e6f8a3da8c9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-18 12:25:43 +05:30
ramamurtis
4f698b3d4f CLOUDSTACK-8246: Add Cluster - Guest traffic label displayed Incorrectly
(cherry picked from commit d363b2afce2b4de1479e147dc3768546b0287b9d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-18 11:23:10 +05:30
Pierre-Yves Ritschard
c37841817e ensure agent reconciliation triggers events
(cherry picked from commit 0ba75bcebde4e8a4773c7b31e5d8b88bf748a131)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-18 11:15:13 +05:30
Marcus Sorensen
e77b4ae8e8 CLOUDSTACK-8263: KVM - use virsh instead of libvirt for resizing qcow2, as libvirt bindings are insufficient
Change-Id: I08246219cb1469a46dc6a9ec76a8c3a67b0b8bf6
2015-02-17 18:10:08 -08:00
Marcus Sorensen
61a50ce5e4 CLOUDSTACK-8263: KVM - notify qemu process of resized volume for libvirt-resized storage
Change-Id: Iddd8bb068855d3565075d3ecf7c6c0f074d00e1a
2015-02-17 14:27:13 -08:00
Rohit Yadav
e5cd75790a CLOUDSTACK-7085, CLOUDSTACK-7084: disallow empty passwords
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-16 15:31:22 +05:30
Daan Hoogland
8ad2e309a4 CLOUDSTACK-8238 handling of retry ping improved
Fixed on 4.4 and master but not on 4.5, cherry-picked on 4.5 using commit
fbafc957dc4e9cdc83aceb2762c0b07296b1a3e6

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
2015-02-16 11:35:41 +05:30
Mike Tutkowski
465ae4760e CLOUDSTACK-8233 kvmtimer fix 2015-02-08 17:45:46 -07:00
Pierre-Luc Dion
c234751069 apidoc: back button and devdoc link update 2015-02-07 16:18:26 -05:00
Pierre-Luc Dion
a8ed45b64b apidoc: license date change to 2015 2015-02-07 16:13:27 -05:00
Rohit Yadav
d4ead2c72a debian: remove old cache after upgrade
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-07 01:38:11 +05:30
Rohit Yadav
8be969124c appliance: fix typo in git repo script tarball url
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-06 23:54:22 +05:30
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 ef6ec7b27675ea44d45c68b30eb2f508655703be)
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 6dd5c3fd42c70855d75156243dddc4933436baaf
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 aaeadc5c44e3fe16a1deea5348b085b08b5f4f4d)
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 e427d0004c7df501912e0c3f9af2f4f237514454)
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 a8b89bea4f37a54267694b9a49be6b5bec91f0b0)
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 4821bfffe2813ffb43761246e75cc7cf73291d27)
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 06437dadf51160252724767fc219de19f96de374)
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 1c94017ff693fbff51553d0095aef4d9e0552098)

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 438f90a2627c4a7408f02fc4b59be7eb566443be)
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 a2547ed827c5fbb7d43181c8d3f84b81ffbeeeda)
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 9eb8d538dd196f27e5194dd2e657afffdb9347eb)
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 ab980cd3b7ae6ada38f7867bdaf3e44b45b6de2f)

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 a12ab8a2b3a14d2fed2bca287823bb558d0501fb
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 d62d511f47ae8118544259b15c9382185364052e)
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 fe0168f6d2d1ee144a1a6e0580464420f1dfa5fe)
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 7b32b8a26808a546d1dbfdf4728c6228a41852b6)
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 781648fb1003c8c32875e9ff7a6c4ef4694539f7)
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