etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,050 Commits 321 Branches 325 Tags 940 MiB
Commit Graph

21050 Commits

Author SHA1 Message Date
Abhinandan Prateek 92254a5a2f Revert "Updating pom.xml version numbers for release 4.2.1" 
This reverts commit 7fb9dcb131e1d2d5a7c87e0aab2929b772bcd008.
 2013-12-03 17:16:18 +05:30
Abhinandan Prateek e8c3c650a7 Updating pom.xml version numbers for release 4.2.1 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-12-03 17:16:17 +05:30
David Grizzanti 03ba659ae7 CLOUDSTACK-5022: NullPointerException when invalid zone is passed into UsageEventUtils 2013-12-03 17:14:28 +05:30
Girish Shilamkar cf1eaad846 CLOUDSTACK-5337: Trimming account name (username) to 99 characters 2013-12-03 16:02:30 +05:30
Anthony Xu 7f9463bb54 put shell scripts to a seperate directory in XS 
use same scripts for both XS and XCP
 2013-12-03 01:36:24 -08:00
Wei Zhou 2fc1161e56 CLOUDSTACK-5310: fix issue: offering display twice in dropdown when create network 
(cherry picked from commit 6ab27267be)
 2013-11-29 11:18:12 +01:00
Wei Zhou 20d8564ed0 allow delete snapshot with ERROR state 
(cherry picked from commit 81c07f1791)

Conflicts:

	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
 2013-11-29 11:18:07 +01:00
Wei Zhou 5cada5ddf2 CLOUDSTACK-5293: get vm disk statistics only from DISK (not for ISO/FLOPPY) 
(cherry picked from commit d473d5a36a)
 2013-11-29 11:18:01 +01:00
Wei Zhou 3a3ed76ae4 [UI] kvm vm snapshot not shown if kvm.snapshot.enabled is set to false 
(cherry picked from commit 64c03dbc31)
 2013-11-29 11:17:55 +01:00
Jessica Wang 37866b4a42 CLOUDSTACK-4428: UI > volume > take snapshot action, recurring snapshot action > for volumes whose hypervisor is KVM and whose VM is not Running, always show the 2 actions regardless value of "kvm.snapshot.enabled". 2013-11-29 11:17:50 +01:00
Wei Zhou 562aa0425b CLOUDSTACK-5299: set hypervisor_type of volumes from image format if not set. 
(cherry picked from commit 221aea5730)

Conflicts:

	server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
 2013-11-29 11:17:45 +01:00
Abhinandan Prateek 224c48a76e Fix issue with sourceCidr not being passed to the VRouter on start 2013-11-29 14:15:12 +05:30
Wei Zhou 04adfe4317 CLOUDSTACK-5293: fix issue when collect vm disk statistics from iso 
(cherry picked from commit f17f35eeb8)
 2013-11-27 14:48:03 +01:00
Wei Zhou e23b10319f CLOUDSTACK-2940: Allowing Replacement of realhostip.com with a customized domain for SSVM 2013-11-26 14:10:51 +01:00
Wei Zhou 888ddd724a CLOUDSTACK-5272: return unlimit if max.account.* or max.project.* is set to negative 2013-11-26 14:05:18 +01:00
Parth Jagirdar fe101f30a9 CLOUDSTACK-5223: Fix hosttags. 
Signed-off-by: Girish Shilamkar <girish@clogeny.com>
 2013-11-26 13:47:36 +05:30
Ashutosh K b2dc2db269 CLOUDSTACK-5257: Fixed Network ACL issue related to Egress traffic 
Signed-off-by: Girish Shilamkar <girish@clogeny.com>

Conflicts:
	test/integration/component/test_vpc_vms_deployment.py

Conflicts:
	test/integration/component/test_vpc_vms_deployment.py
 2013-11-26 12:42:25 +05:30
Girish Shilamkar b21030b851 Fixed a missing hunk from this commit aeb5ec07 2013-11-25 11:44:10 +05:30
Milamber a797029b70 Update L10N strings from Transifex to repo 2013-11-22 03:36:33 +01:00
Murali Reddy 982c5fffbf CLOUDSTACK-5228: [API] [EIP/ELB enabled Zone] Need to display EIP address as 
"Public IP Address" for system VMs

In system VM response object return EIP as public IP in case of basic
zone with EIP service.

Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
 2013-11-21 15:29:17 +05:30
Gaurav Aradhye 2f308cc988 CLOUDSTACK-5201: Correcting code related to schedule of 
recurring snapshot policy
 2013-11-21 11:17:42 +05:30
Ashutosh K fbe5293689 CLOUDSTACK-5204: test_routers - fixed ssh issue 2013-11-21 11:10:15 +05:30
Gaurav Aradhye 631743b44a CLOUDSTACK-5215: Correcting and refactoring code related to 
getting free vlan
 2013-11-21 11:00:15 +05:30
Anthony Xu b2b4b45ae4 don't program security rules in XS host if the zone is not SG enabled 2013-11-20 17:01:53 -08:00
Gaurav Aradhye 465ac16258 CLOUDSTACK-5194: portable ip - Improving cleanup code to 
avoid cascading failures
 2013-11-19 11:18:33 +05:30
Gaurav Aradhye 04807f2b51 CLOUDSTACK-5186: Increasing the waiting time for router to 
come up
 2013-11-16 17:14:23 +05:30
Girish Shilamkar 4df0c4a7b5 CLOUDSTACK-5187: Fix test_vpc_vm_life_cycle recover tests 
The vms were recovered without deleting the vms first
therefore the API failed.
 2013-11-15 23:33:44 -05:00
Ashutosh K 80dfd0f97e CLOUDSTACK-5185: test_egress_fw_rules - failed the test case 
if vm deployment failed instead of going on executing rest
 2013-11-16 15:01:28 +05:30
Edison Su d65c3a70c7 CS-18564: create template from snapshot failed, due to the volume(the 
snapshot created from) is deleted.
 2013-11-15 11:04:17 -08:00
Girish Shilamkar 454d9b04c4 Fix marvin to refer to correct random_gen() function 2013-11-15 17:10:40 +05:30
Girish Shilamkar ac9c4b0233 CLOUDSTACK-2243: base_image_updation - Adding tags to test cases 2013-11-15 16:55:26 +05:30
Gaurav Aradhye 5b2de67673 CLOUDSTACK-5179: Fixed test script issue related to detach 
volume
 2013-11-15 16:31:05 +05:30
Gaurav Aradhye 057a65e9a9 CLOUDSTACK-5147: Removing basic and sg tags from the test 
case which is invalid for basic zone
 2013-11-15 16:26:33 +05:30
Gaurav Aradhye a95bea08e4 CLOUDSTACK-5180: Increasing the timeout for uploading volume 2013-11-15 16:20:46 +05:30
Girish Shilamkar 7671d0fc35 CLOUDSTACK-5148: Fix test_createSharedNetwork_projectSpecific 
VM was being created with accountid and also project. By doing
this create vm or any other resource will fail. Only specify
project in which resource is created.
 2013-11-14 21:26:48 -05:00
Ashutosh K 6ac099e44c CLOUDSTACK-5169: Egress rules - Improved assertion code 
related to SSH to avoid assertion error
 2013-11-15 11:30:33 +05:30
Ashutosh K 1106116b48 CLOUDSTACK-5168: Fixed test script issue related to SSH 
command
 2013-11-15 11:20:44 +05:30
Ashutosh K c653f0eb15 CLOUDSTACK-5166: Fixed test script issue related to egress 
rules
 2013-11-15 11:17:33 +05:30
Nitin Mehta 5f8dc7a38b CLOUDSTACK-5176: 
Added the cluster scope to vmware.reserve factors
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-11-14 15:19:49 -08:00
Jessica Wang 1308ade2cb CLOUDSTACK-3154: UI > zone detail > remove VMware data center action > if API returns error, stop spinning wheel and show returned error text in a pop up dialog. 2013-11-14 14:37:43 -08:00
Wei Zhou e444a03819 remove duplicated scheduled tasks from VpcVirtualNetworkApplianceManagerImpl 2013-11-14 16:51:28 +01:00
Anthony Xu 4918e21452 Revert "Changed host stats to be collected through the http connection" 
This reverts commit 5e44df6de5.
 2013-11-13 19:00:15 -08:00
Anthony Xu 14ee68cfcf Revert "Changed vm stats to be collected through the xs http connection" 
This reverts commit e82e142b14.
 2013-11-13 19:00:14 -08:00
Anthony Xu aee7603abb Revert "Removed the hostvmstats method call from the xs plugin vmops in xcposs" 
This reverts commit c0602d661a.
 2013-11-13 19:00:12 -08:00
Anthony Xu d8e2f6b6f6 Revert "Removed the hostvmstats.py file from the scripts and from all of patch files and from vmops" 
This reverts commit eb19545dc0.
 2013-11-13 19:00:10 -08:00
Anthony Xu a9f473ee5d Revert "Accidentally checked in the wrong file" 
This reverts commit 1c3b9b53fe.
 2013-11-13 18:59:43 -08:00
Anthony Xu fcb806a6ab fixed NPE 2013-11-13 18:24:32 -08:00
Anthony Xu ba9b041fe7 fixed NPE 2013-11-13 17:48:34 -08:00
Anthony Xu 3ebcfa9a7c save securitygroupenabled in host details 2013-11-13 16:27:58 -08:00
Anthony Xu 4238ac9e68 XS host free memory might change, if user manually changes dom0 memory, 
this patch makes CS update latest XS host free memory on host connect process.
 2013-11-13 10:57:19 -08:00