etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,595 Commits 327 Branches 325 Tags 822 MiB
Commit Graph

24595 Commits

Author SHA1 Message Date
Jayapal 7a4a0d7aaa CLOUDSTACK-7622: Fixed deleting network when provider is disable 2014-10-12 23:54:20 -04:00
Min Chen 3ebf49ab28 CLOUDSTACK-7628:VM Worker job should be expunged one hour after 
completion instead of currently being expunged whenever cleanup task
thread is run.
(cherry picked from commit 4317a85e97)
 2014-10-12 23:53:56 -04:00
Jessica Wang 555b20f7ec CLOUDSTACK-7625: UI > IP Address page > EnableVPN > If createRemoteAccessVpn returns success, but the newly created remoteaccessvpn object's state is not Running, treat it as a failure. 
(cherry picked from commit b592e0af34)
 2014-10-12 23:53:26 -04:00
Anthony Xu d036168ecb cleaning up more conflicts 2014-10-12 23:52:53 -04:00
Anthony Xu b4bddc61ac timeInSeconds * 1000 
timeInSeconds is int type, if timeInSeconds is very big, it makes "timeInseconds * 1000" very small even 0

(cherry picked from commit f5eae55abb)
 2014-10-12 23:48:43 -04:00
sanjeev 5c2094eec1 CLOUDSTACK-6172: Adding new test case to verify this fix 
Conflicts:

	test/integration/component/test_volumes.py

Signed-off-by: sanjeev <sanjeev@apache.org>

CLOUDSTACK-6172: Fixed review comments provided in RR 25771
(cherry picked from commit 2d19bcb46a)
 2014-10-12 23:47:05 -04:00
Rajesh Battala f2eec470ab CLOUDSTACK-6603 [Upgrade]DB Exception while Autoscale monitoring after upgrading from 4.3 to 4.4 
(cherry picked from commit c282bb3a12)
(cherry picked from commit fc7d0b2a33)
(cherry picked from commit 0c3d0cc954)
 2014-10-12 23:46:05 -04:00
sanjeev 4076d87038 Creating custom disk does not work as expected 
(cherry picked from commit 0d5a435f76)
 2014-10-12 23:45:27 -04:00
Koushik Das 1b0618d39c CLOUDSTACK-7595: Config parameters "job.expire.minutes" and "job.cancel.threshold.minutes" incorrectly getting multiplied by a factor of 60 
Removed the unnecessary multiply factor for both the config parameters. Also removed the duplicate entries from Config.java as these are not required

(cherry picked from commit a6ee4112a5)
 2014-10-12 23:43:01 -04:00
sanjeev ce2fe3e5df In case of Hyper-v ssvm/cpvm reboot takes time so made changes to handle this 
(cherry picked from commit 5bddebb8fc)
 2014-10-12 23:42:40 -04:00
Prashant Kumar Mishra b771b6ee72 CLOUDSTACK-7579 Adding a method to base.py to update storage pool 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
(cherry picked from commit 937aee34ed)
 2014-10-12 23:42:15 -04:00
Devdeep Singh e0317eeec4 CLOUDSTACK-7494. Migration of a vm fails on Hyper-V. In an earlier commit as part of 
cleaning up vmsync changes, checkvirtualmachine command was updated to return the
power state of the vm. The change was missed for Hyper-V. This caused migration to
fail on cloudstack even though it used to succeed on the hypervisor. Updated the
hyper-v agent code to return the cloudstack equivalent power state for check virtual
machine answer.

(cherry picked from commit 5350e61187)
 2014-10-12 23:40:37 -04:00
Min Chen b979c6f0c7 CLOUDSTACK-7589: VM not Starting and always stuck in Stopped state after 
management server restarts.

(cherry picked from commit 7cdb67dcf1)
 2014-10-12 23:40:07 -04:00
punith-cloudbyte 9bbcef4540 IOPS null issue CLOUDSTACK-7570 
Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com>
(cherry picked from commit dd4f6bcaf3)
 2014-10-12 23:39:46 -04:00
Nitin Mehta 988b9efc97 CLOUDSTACK-7588: [Vmware] Creating templates (with same names) from volumes get deleted from CS. Fix it by changing the unique name generation to the standard one used by registertemplate. Also cleaned up vmtemplatevo which had too many constructors. 
(cherry picked from commit 082aed3d33)
 2014-10-12 23:39:21 -04:00
Sangeetha Hariharan 8f4e8a4d79 CLOUDSTACK-7587 - Automation - Add simulator_only attribute to acl related test cases. 
(cherry picked from commit 7877f3f960)
 2014-10-12 23:38:53 -04:00
Gabor Apati-Nagy 4fd0799d30 CLOUDSTACK-7562: Details page for disk offerings only show details for write performance 
-Fixed all related typos

Signed-off-by: Brian Federle <brian.federle@citrix.com>
(cherry picked from commit dbb70fadc0)
 2014-10-12 23:36:25 -04:00
Gabor Apati-Nagy f456cda8cc CLOUDSTACK-7561: UI: After creating a new account, the "Add Account" dialog remains open 
-Removed unused code that was causing javascript exception

Signed-off-by: Brian Federle <brian.federle@citrix.com>
(cherry picked from commit 30611be15a)
 2014-10-12 23:35:30 -04:00
David Nalley ffe846673c more revert cleanup 2014-10-12 23:31:17 -04:00
David Nalley ac48aa8e0c cleaning up some from a revert 2014-10-12 23:30:04 -04:00
David Nalley 3cac7f01bb Revert "CLOUDSTACK-6278" 
This reverts commit bc2ec23d09.
 2014-10-12 23:19:30 -04:00
Hugo Trippaers e327716b89 Merge branch 'bugfix/CID-1114601' 2014-09-19 15:15:33 +02:00
Hugo Trippaers 4ad2734576 CID-1114601 to 1114604 Recommended practice is to test the result of 
skip and read for EOF
 2014-09-19 14:29:01 +02:00
Hugo Trippaers 90df7cf881 CID-1116300 Prevent potential NPE 2014-09-19 11:55:17 +02:00
Hugo Trippaers 6f54d48772 CID-1116298 path can be null, make sure that is properly handled 2014-09-19 11:54:21 +02:00
Hugo Trippaers 6687727b76 Frank forgot the license header 2014-09-19 10:14:38 +02:00
Hugo Trippaers d7f5a2705e Merge branch 'bugfix/CID-1191682' 2014-09-19 08:29:22 +02:00
Hugo Trippaers cf4ff03c90 CID-1191682 Fix missing break statement 2014-09-19 08:28:42 +02:00
Mike Tutkowski 18e5aa116e Fixing an issue around VMware system templates 2014-09-18 19:38:59 -06:00
Sangeetha Hariharan 7537c33bcd CLOUDSTACK-7585 -Automation - Fix test_acl_sharednetwork.py and test_acl_sharednetwork_deployVM-impersonation.py to pick 'Shared Network' network offering when creating networks 2014-09-18 19:53:28 -07:00
Frank Zhang b11e3bc60a CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-18 16:54:37 -07:00
Frank Zhang bc2ec23d09 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-18 16:54:37 -07:00
Frank Zhang 8b89494a35 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-18 16:54:37 -07:00
rayeesn d315a5e2c9 CLOUDSTACK-7522 : Update package.sh to exit rpm with return 1, if there are failure in build 2014-09-18 16:01:53 -07:00
Hugo Trippaers 8a13f44b44 Remove duplicate field in constructor 2014-09-18 16:02:26 +02:00
Hugo Trippaers d1d8009c68 Fix a stupid bug i introduced 2014-09-18 16:02:26 +02:00
Koushik Das 4e07dd1dc4 CLOUDSTACK-7581: Empty 'ID' parameters allowed in API calls 
Fix is to fail API calls with empty 'id' parameter value upfront rather than going ahead and failing with NPE later on
 2014-09-18 17:10:25 +05:30
Daan Hoogland 7f440854f7 CLOUDSTACK-7184 retry-wait loop config to deal with network glitches 
(cherry picked from commit a29f954a26)

Conflicts:
	engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
 2014-09-18 12:55:05 +02:00
Daan Hoogland 6e1e56d399 CLOUDSTACK-7527 reboot faster by writing to /proc/sysrq-trigger 
(cherry picked from commit d04f59a30d)
 2014-09-18 12:51:42 +02:00
Daan Hoogland dec9133dcd CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval 
(cherry picked from commit 4d065b9a3a)

Conflicts:
	plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
	plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/resource/DiscovererBase.java
 2014-09-18 12:51:10 +02:00
Rohit Yadav 2cd99e3e72 CID-1116245: Lock for getting answers from SynchronousListener 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-18 11:56:29 +02:00
Rohit Yadav 3640c61207 CID-1116248: Synchornize method in SynchronousListener 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-18 11:54:31 +02:00
Rohit Yadav bd1752811c CID-1116250: Lock on s_appContextDelegates before calling get in ComponentContext 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-18 11:52:18 +02:00
Rohit Yadav b1d0df16cf CID-1116258: Guard _storagePools using synchronized in KVMStoragePoolManager 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-18 11:48:11 +02:00
Rohit Yadav bfa36c0280 CID-1233090, CID-1233089: Synchronize on session object in ApiServer 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-18 11:26:20 +02:00
Rohit Yadav ec134cf010 CID-1116231: Use implicit lock, synchronize _key in Link 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-18 11:21:57 +02:00
Gaurav Aradhye 032bce5b54 CLOUDSTACK-7565: Fixes to avoiding QEMU issue in attach volume operation by changing test case steps 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-09-18 12:01:02 +05:30
Anthony Xu 071004e3e1 removed start/stop VR from queue 2014-09-17 19:04:34 -07:00
Anthony Xu 674af6e473 added hypervisor capacity for XS 6.5.0 2014-09-17 18:15:41 -07:00
Anthony Xu e5a91e40dd in tagCommand, AsyncJobExecutionContext doesn't need to be created if it doesn't exist 2014-09-17 18:15:41 -07:00