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

34084 Commits

Author SHA1 Message Date
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 083a4950a9 Fix typos 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit af278fe1ab)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 15:54:01 +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 8414223a96 CLOUDSTACK-5494: Fixed dns is open to public in VR 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 81994cf443)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 15:31:13 +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 06437dadf5 CLOUDSTACK-8220: Let's have a separate XenServer 6.5 resource 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 14:44:10 +05:30
Rohit Yadav 1c616392db DeployVmCmd: Fix NPE case 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d2bf21065e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 14:21:29 +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
SrikanteswaraRao Talluri 6e3009a299 CLOUDSTACK-8161: fixed few more wrong references 
in the tests
 2015-02-05 18:48:32 +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 a8f9233377 CLOUDSTACK-8146: close search builder using done() 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a4d24adfb8)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 18:06:15 +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
Gaurav Aradhye a4e9b4e8a4 CLOUDSTACK-8211: Correcting expected secondary storage count value by rounding off to floor value and including the physicalsize of snapshot 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2015-02-05 17:32:35 +05:30
Erik Weber c31e8e7409 CLOUDSTACK-8215: Change Date calculation to Joda DateTime 
(cherry picked from commit 03e07c41b5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 17:22:31 +05:30
Erik Weber fdf4bd2ea2 SAML changing date calculation 
Signed-off-by: Erik Weber <terbolous@gmail.com>
(cherry picked from commit b84c8889a3)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 17:22:20 +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
Rohit Yadav fae4fdae53 ApiResponseHelper: fix NPE when parent of snapshot is null 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 17:02:30 +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 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