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

23705 Commits

Author SHA1 Message Date
Nitin Mehta 80ef915fd5 CLOUDSTACK-7000: ListSnapshotPolicy should list by policyid. Introduce updateSnapshotPolicy command 
(cherry picked from commit fce21439fa)
 2014-06-26 11:38:41 -07:00
Mike Tutkowski 06d3043954 Submitted on behalf of Vetri for Review Request 23008 2014-06-26 10:54:27 -06:00
Girish Shilamkar 7bc997f4fb CLOUDSTACK-6984: Re-enable the testcase 2014-06-26 15:25:04 +05:30
John Dilley 477a812a6f CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-06-25 19:42:43 +02:00
Daan Hoogland 3268f5bd1f CLOUDSTACK-6747 test for test to allow all cidrs on other end of a vpc 2014-06-25 17:09:19 +02:00
Daan Hoogland d90b8d88ed Revert "CLOUDSTACK-6747 test for test to allow all cidrs on other end of a vpc" 
This reverts commit 218c4713ae.
 2014-06-25 17:06:10 +02:00
Daan Hoogland 218c4713ae CLOUDSTACK-6747 test for test to allow all cidrs on other end of a vpc 2014-06-25 16:58:52 +02:00
Hugo Trippaers 05b79a127a Fix the license headers Nitin forgot. 2014-06-25 16:07:00 +02:00
Hugo Trippaers ab0dca0385 Catch possible exceptions in finally so they won't shadow the original exception. 2014-06-25 15:51:29 +02:00
Hugo Trippaers 99b7cc80ec Add provisioning_type to the devcloud offerings. 2014-06-25 15:51:29 +02:00
Hugo Trippaers cd0ef09344 Fix typo and add the right exception to the error map. 2014-06-25 15:51:28 +02:00
Hugo Trippaers d781824aa9 These should have been gone a long time ago 2014-06-25 15:51:28 +02:00
Hugo Trippaers 0ef61f7967 Set the default provisioning_type to something that doesn't cause NPEs when used. 2014-06-25 15:51:28 +02:00
Hugo Trippaers 49b0936a72 Fix several potential issues reported by coverity. 2014-06-25 15:51:28 +02:00
Daan Hoogland 17850c7aff CLOUDSTACK-6747: call a more forgiving test on the supplied peer 
cidr-list
 2014-06-25 15:45:28 +02:00
Daan Hoogland cd3b027f44 findbugs: unit test coverage on the utils package 2014-06-25 15:43:08 +02:00
Daan Hoogland 018b471ad3 CLOUDSTACK-6747 test to allow all cidrs on other end of vpc, public or 
private
 2014-06-25 14:59:14 +02:00
Girish Shilamkar 867c894d27 Re-enabling fixed test case test_primary_storage.py 
Conflicts:

	test/integration/smoke/test_primary_storage.py
 2014-06-25 18:08:36 +05:30
Girish Shilamkar 83f2bb5ac7 Re-enabling fixed test cases 
Conflicts:

	test/integration/smoke/test_scale_vm.py
 2014-06-25 18:02:04 +05:30
Rajani Karuturi c468228fe8 CLOUDSTACK-6926: removed hard coded jdk dirs and setting java home using readlink and dirname 2014-06-25 17:23:42 +05:30
Sheng Yang 75c9a20c77 CLOUDSTACK-6989: Add 3 strikes rule for RvR freezing detection 
Sometime in VR ntpd would move time backward to keep sync with NTP server, which
can result in false alarm of keepalived monitering process.

This patch adds 3 strikes for keepalived process dead detection to avoid falsely
shutdown keepalived process due to time adjustment for only once.
 2014-06-24 17:04:58 -07:00
Kelven Yang f756d4aa33 Make job info universally available across management server and resource agents 2014-06-24 16:28:22 -07:00
Mike Tutkowski 3d9eaf0753 Fixed some spacing issues from 4d6c682f18 2014-06-24 15:27:06 -06:00
Santhosh Edukulla b2283d7a28 Fixed few resource leaks and added secstoragefirewallcfg command support to simulator 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-06-24 23:19:47 +02:00
punith-cloudbyte 4d6c682f18 supporting nfs protocol and resize feature for managed storage for xenserver 
resize feature refactored

Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com>
 2014-06-24 15:16:45 -06:00
Nitin Mehta cb5e8c591f CLOUDSTACK-6987: Add support for storing metadata for snapshot policy and controlling policy using display flag 
(cherry picked from commit 5cf8edd7ec)
 2014-06-24 14:07:39 -07:00
Mike Tutkowski c344693e48 Inform the applicable storage plug-in's life cycle that capacity (bytes and/or IOPS) can be updated 2014-06-24 14:39:57 -06:00
Gaurav Aradhye 0df156c09e CLOUDSTACK-6984: Resolving issues found during simulator run 2014-06-24 20:54:05 +05:30
Daan Hoogland c79ab570b0 Revert "CLOUDSTACK-6967: Initial OVM3 drop" 
This reverts commit 8a485b9b59.
 2014-06-24 10:24:01 +02:00
Daan Hoogland be028974da Revert "CLOUDSTACK-6967: Now with module!" 
This reverts commit 189972bc7c.

Conflicts:
	plugins/hypervisors/ovm3
 2014-06-24 10:23:49 +02:00
Daan Hoogland fec52be20e Revert "raw immage for ovm" 
This reverts commit 23b1f228a1.
 2014-06-24 10:21:05 +02:00
Daan Hoogland 91e300eb82 Revert "CLOUDSTACK-6967 merge problem resolution" 
This reverts commit 4610c76fa9.
 2014-06-24 10:21:03 +02:00
Daan Hoogland d69e14323a Revert "rats" 
This reverts commit aa1ce9a363.
 2014-06-24 10:21:01 +02:00
Daan Hoogland 1087655ca0 Revert "fix up create-schema.sql" 
This reverts commit 878b0ac164.
 2014-06-24 10:20:56 +02:00
Girish Shilamkar fef55acbbf CLOUDSTACK-6914: Disabling few failing BVTs 2014-06-24 13:14:14 +05:30
Jayapal 5da2e9828d CLOUDSTACK-6923: Fixed issue in lbsticlbsticlbrule with lbrule id 2014-06-24 11:08:15 +05:30
Damodar Reddy d3ffb7a565 CLOUDSTACK-6444: Fixing the issue with iSCSI path Format /targetIQN/LUN. 
Signed-off-by: Koushik Das <koushik@apache.org>
 2014-06-24 10:11:44 +05:30
Ian Duffy 878b0ac164 fix up create-schema.sql 2014-06-23 20:30:59 +01:00
Sheng Yang a93a30595d CLOUDSTACK-6854: Fix inconsistent IPv6 address formats 
fc00:0003:1373::0002 should be treated the same as fc00:3:1373::2.
 2014-06-23 10:54:12 -07:00
Daan Hoogland aa1ce9a363 rats 2014-06-23 16:39:10 +02:00
Funs Kessen 4610c76fa9 CLOUDSTACK-6967 merge problem resolution 2014-06-23 15:08:51 +02:00
Daan Hoogland 23b1f228a1 raw immage for ovm 2014-06-23 14:54:07 +02:00
Funs 189972bc7c CLOUDSTACK-6967: Now with module! 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit 1516b041bc)
 2014-06-23 12:39:23 +02:00
Funs 8a485b9b59 CLOUDSTACK-6967: Initial OVM3 drop 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit ed47763e25)

Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
	plugins/pom.xml
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	ui/scripts/docs.js
 2014-06-23 12:39:10 +02:00
Anshul Gangwar bbcffbbab0 CLOUDSTACK-6965: fixed the NullPointerException introduced by fix for cloudstack 
6935 in AbstractStoragePoolAllocator#filter method for Zone Wide storage
 2014-06-23 12:17:08 +05:30
Anshul Gangwar 6416de5770 CLOUDSTACK-6968: allowing cluster scope volumes to attach to any VM. If migration is 
needed then first they will be migrated to appropriate cluster before attaching.
 2014-06-23 12:15:10 +05:30
Santhosh Edukulla 1c80185170 Fixed Resource Leaks, null dereferences, invalid value comparisons, invalid result set loop 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-06-21 12:38:46 +02:00
Min Chen a97455b602 CLOUDSTACK-6971: createAutoScaleVmProfile failed with NPE due to lack of bean 
injection.
 2014-06-20 14:28:26 -07:00
Logan B 736bf540e8 Changed logic for copying snapshot from S3 to NFS staging store to prevent needless failure. 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-06-20 22:37:21 +02:00
Kelven Yang 60f4203cbc Protect event interpretion from causing NPE exception 2014-06-20 10:16:04 -07:00