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

738 Commits

Author SHA1 Message Date
Alex Huang 3ecc52a4f3 Re-absorb delta in master into vmsync 2013-07-03 17:58:38 -07:00
Alex Huang 8d21f49ec9 Another merge to pull in object store fix. Also to check how changes that are applied to both master and vmsync are merged 2013-07-03 15:01:23 -07:00
Edison Su b59b1b4c93 fix can't find host ip address on Mac OS 2013-07-03 14:34:37 -07:00
Laszlo Hornyak f15a6e4b6d removed EnumerationImpl 
EnumerationImpl was not used and duplicates functionality
with org.apache.commons.collections.iterators.EnumerationIterator

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-07-03 10:08:21 +05:30
Alex Huang 57bafc8fe9 Another merge from master. This is just getting laborious 2013-07-01 11:29:57 -07:00
Laszlo Hornyak 16b7509a23 removed CleanupDelegate 
It did not have an implementation

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2013-07-01 17:08:15 +02:00
Mike Tutkowski 99227f7b3e SolidFire plug-in and related changes 
SolidFire plug-in

SolidFire plug-in related
 2013-06-28 16:59:21 -06:00
Alex Huang c6ba4a23e8 Deadlock resolved 2013-06-27 14:00:31 -07:00
Alex Huang 262352a1c6 Another merge from master to bring over fixes to bugs that broke the bvt 2013-06-27 11:16:32 -07:00
Laszlo Hornyak 882e5fa4e0 FileUtil simplified 
- writeToFile removed since no references to it
- readFileAsString replaced with FileUtils.readFileToString
- minor code duplication removed in dependent method getNicStats
- unit test added

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-06-27 11:08:03 -07:00
Hugo Trippaers 881a6e164e Disable the NioTest, it is far to dependent on the network configuration of the machine running the test. 2013-06-25 12:20:51 -07:00
Alex Huang 7b7db0560c merge is complete 2013-06-24 16:50:31 -07:00
Alex Huang 95fe42cc7c Migration work 2013-06-24 10:16:37 -07:00
Edison Su 9aec9c605c merge to master 2013-06-19 18:16:47 -07:00
Prasanna Santhanam 168fb29d69 add some logging to NioTest 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-06-19 09:28:16 +05:30
Min Chen 1eb39665bd CLOUDSTACK-3030: Object_Store_Refactor - Download template from S3 
should not set template to public-readable.
 2013-06-18 09:45:50 -07:00
Alex Huang e2edae1711 Merge from master 2013-06-17 19:00:44 -07:00
Alex Huang 6adf761848 fixes null pointer 2013-06-17 17:25:01 -07:00
Alex Huang 3a074f31ae Removed a bunch of useless classes. Move configuration into utils package 2013-06-17 17:04:04 -07:00
Alex Huang 2b96665bf4 jobs changes 2013-06-17 17:04:00 -07:00
Laszlo Hornyak c88d8fb3a2 use commons-lang StringUtils 
commons-lang is already a transitive dependency of the utils project, which allows removing some duplicated functionality.
This patch replaces StringUtils.join(String, Object...) with it's commons-lang counterpart.
It also replaces calls to String join(Iterable<? extends Object>, String) in cases where an array is already exist and it is only wrapped into a List.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-06-17 19:17:22 +01:00
Laszlo Hornyak 564013bec0 String instantiation is not needed 
Removed a String instntiation, test case added

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-06-17 19:17:22 +01:00
Hugo Trippaers b0ea02e65a Allow DSA public keys. 
DSA can't be used for encryption with the bouncycastle library, so make
sure this situation is properly handled.
 2013-06-17 10:04:59 -07:00
Edison Su f41c800d88 merge to master 2013-06-14 19:06:33 -07:00
Sheng Yang fbe6b273e3 CLOUDSTACK-1170: Redundant Router: Ensure MACs are same on other than first public nic 2013-06-13 16:05:15 -07:00
Alex Huang 3ef77bc85a Complete the move of the virtualmachinemanager to cloud-engine 2013-06-13 13:50:59 -07:00
Min Chen 18aeef3ef1 Merge branch 'master' (up to commit 
c30d9be3ce) into object_store.
 2013-06-12 11:20:32 -07:00
Bharat Kumar ca13586331 Cloudstack-2511 Multiple_Ip_Ranges: Adding guest ip range in subset/superset to existing CIDR is allowed Cloudstack-2651 [Shared n/w]Add IP range should ask for gateway and netmask 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-06-12 16:27:56 +05:30
Chiradeep Vittal 971c40d98e Fix RAT check broken by a1a68ed0c4 2013-06-10 20:38:24 -07:00
Alex Huang a1a68ed0c4 Review 11752 applied 2013-06-10 16:07:05 -07:00
Alex Huang aaa16af211 Merged from master 2013-06-09 17:53:27 -07:00
Alex Huang ebbd4008ad zone creation complete once more 2013-06-07 18:15:55 -07:00
Min Chen 1d6ed8ac20 A hack to handle RiakCS bug in generating ETAG for multi-part upload 
object.
 2013-06-07 16:00:19 -07:00
Alex Huang 5e6d2cf559 Fixed the start 2013-06-07 10:11:57 -07:00
Saksham Srivastava 5dc7387d3b CLOUDSTACK-1647: IP Reservation should not happen if the guest-vm cidr and network cidr is not same but their start ip and end ip are same. 
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
 2013-06-07 16:54:40 +05:30
Kelven Yang 90df846adb Fix CallContext NDC cleanup problem 2013-06-06 17:52:21 -07:00
Min Chen 4e404953ad Support Multi part upload for S3 using TransferManager. 2013-06-05 09:40:33 -07:00
Alex Huang dd11254087 further refactored jobs 2013-06-04 13:54:33 -07:00
Alex Huang b8261b8705 Moved UserContext to its proper place as CallContext 2013-05-31 05:05:05 -07:00
Alex Huang 7bdddd0726 merged from master 2013-05-29 15:45:38 -07:00
Alex Huang d84bb9720f Finally fixed async job 2013-05-29 15:28:00 -07:00
Anthony Xu 6a7cc2021e when VR is rebooted, CloudStack will reapply all ips/rules to VR, 
this patch will reduce time the VR reboot takes
 - remove 1 s sleep in vmware
 - reduce the time arping takes
 2013-05-29 13:45:07 -07:00
Min Chen 6e55776795 CLOUDSTACK-2331: Failed to display exception object information in case of CloudRuntimeException. 2013-05-28 16:01:33 -07:00
Jayapal 704471e6de CLOUDSTACK-2386 Fixed srx firewall icmp rule 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-05-24 10:30:12 +05:30
Alex Huang 6a1e1e80fe Merged from master 2013-05-23 18:16:32 -07:00
Min Chen 98af424053 Merge branch 'master' into object_store. 2013-05-23 18:00:15 -07:00
Alex Huang 099778e38e Finally finished how to get virtualmachine manager to work correctly 2013-05-23 17:55:23 -07:00
Min Chen f5732fe3bf Consolidate code to use UriUtils.validateUrl instead of repeating code 
several places.
 2013-05-21 16:50:02 -07:00
Prachi Damle dce4258171 CLOUDSTACK-2568: ACS41 regression in storage subsystem (seen with local storage and 2 or more hosts) 
Changes:
- In VolumeReservationVO, the  getter method of a column had a typo, causing us to create a wrong searchbuilder. It was searching over the 'id' column instead of 'vm_reservation_id' causing
- This bug was causing the vm deployment to choose a wrong pool during deployment since the search was choosing incorrectly
- This bug in the GenericSearchBuilder is also fixed - if the getter method does not use the standard 'get' or 'is' prefix, one should annotate that method using
 @Column(name = "<column_name>") and indicate which column this method refers to. This will cause the GenericSearchBuilder to identify the field correctly.
 2013-05-21 16:06:29 -07:00
Min Chen 255d08ae7c Fix CLOUDSTACK-2586: ExtractTemplate for S3 template should give URL 
directly from S3.
 2013-05-20 12:06:36 -07:00