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

22269 Commits

Author SHA1 Message Date
Alex Huang de6bf7470c One more merge conflict 2013-11-21 08:16:48 -08:00
Alex Huang 433a631916 Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00
Hugo Trippaers 3a414a850f Add the upgrade path to all versions 2013-11-21 16:38:08 +01:00
Alex Huang 170f32f171 Broke up some long strings 2013-11-21 07:25:01 -08:00
Hugo Trippaers cf715ff491 Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01:00
Wido den Hollander 036fffcd7c Add upgrade path from 4.3 to 4.4 2013-11-21 15:48:01 +01:00
Alex Huang d620df2bdd Reformatted all of the code. 2013-11-21 06:15:26 -08:00
Wido den Hollander dc037b8d2f Revert "CLOUDSTACK-1302: Add cache mode to SQL upgrade file" 
This reverts commit 7f1168cec7.
 2013-11-21 15:09:26 +01:00
Alex Huang eaa250fd3c Formatted again after all the tab expansions and eol removals 2013-11-21 04:47:01 -08:00
Alex Huang 224f479974 Removed trailing spaces 2013-11-21 04:08:01 -08:00
Alex Huang e4b22d0fca Replace all tabs, particularly the ones in the comments 2013-11-21 03:39:58 -08:00
Alex Huang 62e9273581 Removed trailing spaces 2013-11-21 03:12:05 -08:00
Alex Huang 0232906708 Brought in Hugo's checkstyle 2013-11-21 03:09:07 -08:00
Murali Reddy 899e9f0d60 CS-16962: [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:20:28 +05:30
Rajesh Battala 8c6840e489 Modified GetExternalVirtSwitch to take the switchname param and return the same or default one 2013-11-21 14:36:47 +05:30
Likitha Shetty 6aafb9c50d CLOUDSTACK-5227. Cannot pass Japanese characters as parameter values to an API. 
During API check for control characters use pattern matching to avoid identifying all non-printable characters as control characters.
 2013-11-21 13:40:06 +05:30
Wido den Hollander 7f1168cec7 CLOUDSTACK-1302: Add cache mode to SQL upgrade file 
This got lost in the previous commit

Not sure though if this is the right file, since this feature won't make it into
4.3, but there is no 4.4 file.
 2013-11-21 09:00:11 +01:00
Rajesh Battala 4f1821bf3a Add support of attaching nic's to the specified network labels in HyperV 2013-11-21 11:55:17 +05:30
Gaurav Aradhye 138cee401f CLOUDSTACK-5201: Correcting code related to schedule of 
recurring snapshot policy
 2013-11-21 11:15:32 +05:30
Ashutosh K db2ea0a16a CLOUDSTACK-5204: test_routers - fixed ssh issue 2013-11-21 11:06:34 +05:30
Gaurav Aradhye 6aca7de291 CLOUDSTACK-5215: Correcting and refactoring code related to 
getting free vlan
 2013-11-21 10:53:27 +05:30
Likitha Shetty 273c912bb6 CLOUDSTACK-1868. GetVmStatsCommand throws NullPointerException with VMWare. 2013-11-21 09:39:44 +05:30
Kelven Yang 278ef81a83 side-by-side VM sync management at manager level 2013-11-20 17:59:38 -08:00
Edison Su 2d42b2d1ab Add logs in case ipassoccmd failed 2013-11-20 15:07:02 -08:00
Jessica Wang 86736d6d4a CLOUDSTACK-5222: UI > Infrastructure > Sockets > count only hosts whose type is routing. 2013-11-20 14:50:31 -08:00
Wido den Hollander 1edaa36cc6 CLOUDSTACK-1302: Allow a cache mode per disk offering 
Per disk offering the setting none, writeback or writethrough can be set

This allows for both safety and performance for writes.
 2013-11-20 17:11:10 +01:00
Alex Huang 8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Ian Duffy 31758ed8d0 Fix codestyle/formatting within plugins/userauthenticators/ldap 2013-11-20 14:00:08 +01:00
Rajani Karuturi 917ea33ba9 added LDAP group name label in add account wizard 
changed the parameter for domain in api importLdapUser from name to UUID

improved error handling
 2013-11-20 13:57:41 +01:00
Chip Childers 2febc318aa No, this field does not use CIDR notation 2013-11-20 11:10:14 +00:00
Likitha Shetty 90fb76a72c CLOUDSTACK-5069. Added global config 'vmware.vcenter.session.timeout' to make the vCenter session timeout value configurable. 2013-11-20 16:12:22 +05:30
fjkdf 8321ea4d78 add mgt.server.vendor global configuration, in case different vendor wants to identify its identity 2013-11-19 17:55:58 -08:00
Alex Huang 465626f6d1 Fixed issues with execute in sequence 2013-11-19 17:20:58 -08:00
Jessica Wang 829f1db6e8 CLOUDSTACK-4793: UI > Virtual Routers > add new action "Upgrade Router to Newer Template" in detailView. 2013-11-19 16:15:49 -08:00
Jessica Wang d6a38c238a CLOUDSTACK-4793: UI > Virtual Routers > add new action "Upgrade Router to Newer Template" on top of listView. 2013-11-19 14:32:18 -08:00
Syed Ahmed 481af07fb1 Adding protocol parameter to loadbalancer response 2013-11-19 22:12:44 +05:30
Gaurav Aradhye 67b071beaa CLOUDSTACK-5194: portable ip - Improving cleanup code to 
avoid cascading failures
 2013-11-19 11:21:33 +05:30
Jessica Wang 2587e42db6 CLOUDSTACK-4793: UI > Virtual Routers > Advanced Search > add cluster dropdown since API now supports it. 2013-11-18 15:02:35 -08:00
afornie 876b7e492f Checkstyle adjustments in code and configuration 2013-11-18 19:22:42 +01:00
Daan Hoogland 709b70c6d1 dos2unix 2013-11-18 19:22:30 +01:00
Hugo Trippaers 1ece5f0c28 StoragePoolResponse.getId() returns a String with an UUID 2013-11-18 14:27:06 +01:00
Hugo Trippaers bb8f8fb20b Expose getPrimaryDataStore(String uuid) through the DatastoreManager interface so it can be used clients. 2013-11-18 14:27:06 +01:00
Kishan Kavala a9413707c9 Fix listRouter by clusterId and upgradeRouterTemplate by clusterId 2013-11-18 13:05:34 +05:30
Laszlo Hornyak 065e5afa08 Tests for DBUtil 
This patch adds test for the lock management:
- getGlobalLock
- releaseGlobalLock

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-11-16 15:44:31 +01:00
Gaurav Aradhye 438cf4ea63 CLOUDSTACK-5186: Increasing the waiting time for router to 
come up
 2013-11-16 17:15:14 +05:30
Girish Shilamkar e2051de98e 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:38:57 -05:00
Ashutosh K 02c15528c8 CLOUDSTACK-5185: test_egress_fw_rules - failed the test case 
if vm deployment failed instead of going on executing rest
 2013-11-16 14:57:59 +05:30
Alena Prokharchyk 7791d63077 Added one more log file location to .gitignore 2013-11-15 09:33:05 -08:00
Girish Shilamkar 0b8cc9705f Fix marvin to refer to correct random_gen() function 2013-11-15 17:13:12 +05:30
Girish Shilamkar 09c0370d70 CLOUDSTACK-2243: base_image_updation - Adding tags to test cases 2013-11-15 16:53:33 +05:30