apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,546 Commits 307 Branches 324 Tags
Commit Graph

15546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kelven Yang
2c5859dbd4 Bring javelin back to the status of being able to start System VMs after another round of master branch merge 2013-01-18 19:15:32 -08:00
Kelven Yang
d056cd5cab Add configurable components to Spring XML context file to allow configuration of componets not hard-coded in code 2013-01-18 19:15:32 -08:00
Rohit Yadav
64f13e1cd8 DatabaseCreator: Fast forward merge due to recent pull in merge of master 2013-01-18 18:16:04 -08:00
Rohit Yadav
e70143c1dc maven: Fix developer/pom.xml to use DatabaseCreator 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-18 18:11:42 -08:00
Rohit Yadav
03a3837d92 DatabaseCreator: Make it reinit db, add flags, opts, run scripts and upgrade checkers 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-18 18:09:04 -08:00
Rohit Yadav
7fbe935c36 Transaction: Fix static, add method to reinit static datasource off a db props file 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-18 18:08:11 -08:00
Rohit Yadav
e688fbfc24 ScriptRunner: Alternate constructor to get verbosity flag 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-18 18:07:37 -08:00
Rohit Yadav
6214b1d4bd db.properties: adding other key value info for dbcreator to work in a generic way 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-18 17:19:55 -08:00
Alex Huang
4a9cf4b4a8 Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin 2013-01-18 15:59:24 -08:00
Alex Huang
fe6f0457d5 fixed unit tests from merge 2013-01-18 15:58:55 -08:00
Edison Su
224621197c add misssing files 2013-01-18 15:39:37 -08:00
Edison Su
1283712d93 replace spring injection in nfssecondarystorage 2013-01-18 15:10:08 -08:00
Alex Huang
10d9c019a9 All merge conflicts resolved 2013-01-18 12:14:57 -08:00
Chiradeep Vittal
ce4b49d30b network-refactor merge: fix nonoss build 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-18 09:38:49 -08:00
Koushik Das
e45a9f3aed CLOUDSTACK-803: HA gets triggered even when the host investigator is unable to determine the state of the host HA won't be triggered in case the host investigator is not able to determine the state 
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-01-18 17:20:51 +05:30
Koushik Das
070856affd CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version 
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-01-18 16:49:52 +05:30
Kishan Kavala
51c1ca7cbe CLOUDSTACK-1010: Fix count issue for listHosts command 2013-01-18 16:13:25 +05:30
Marcus Sorensen
55e8965bd0 Summary: Pass StoragePoolType that maps to libvirt in cleanupDisk 
Description: When selecting a storage adaptor, cleanupDisk assumes that
libvirt is being used. Therefore, we pass a StoragePoolType that maps to
libvirt. This is the only place in LibvirtComputingResource where the
StoragePoolType can't be pulled from somewhere else.

BUG-ID: CLOUDSTACK-1011
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
 2013-01-18 00:20:34 -07:00
Rohit Yadav
a0bc5089d0 maven: disable awsapi by default, enable by -P awsapi profile 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 21:58:22 -08:00
Rohit Yadav
593b60ca51 rat: Fix license on newly added files 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 21:37:24 -08:00
Kelven Yang
249dcde364 Add FactoryBean for VirtualMachineEntity to help implement dyanmic injection 2013-01-17 21:06:45 -08:00
Rohit Yadav
ddf9c6586d Transaction: cosmetics fix 
The default data source assumption is that db server is on localhost, port 3306
and has user cloud and password cloud. The static variables rely on hardcoded
db.properties file only. We need to fix it

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 19:09:38 -08:00
Kelven Yang
e5507c3892 Deprecate 2.1.x migration DAOs, it breaks EntityManager's singleton assumption 2013-01-17 18:55:14 -08:00
Edison Su
ddc53771bf implement toURI 2013-01-17 18:49:50 -08:00
Edison Su
c4a11b9979 rename datastream to dataobject 2013-01-17 18:49:50 -08:00
Rohit Yadav
4ca828c1d6 maven: disable awsapi by default, enabled by -P awsapi profile 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 18:40:59 -08:00
Rohit Yadav
b45cdef5d9 DatabaseCreator: Process db props, sql and upgrade classes separately 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 18:25:27 -08:00
Kelven Yang
17a94b20ec Always use premium setting in ConsoleProxyManager 2013-01-17 18:23:06 -08:00
Kelven Yang
93985ae191 allow nested injection in ComponentContext 2013-01-17 18:23:06 -08:00
Rohit Yadav
b120e19280 ApiDispatcher: In case of incorrect long int value or uuid, throw error 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 17:59:53 -08:00
Koushik Das
cd37e22f9b CLOUDSTACK-810: Make DirectAgent thread pool size configurable Removed hard-coding of directagent thread pool size and now reading it from configuration 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-17 17:21:52 -08:00
Rohit Yadav
f264571e92 ApiServer: Fix default reponse type for apiserver on intergration port to xml 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 17:03:27 -08:00
Chiradeep Vittal
f1d7d96414 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 
Re-re-merge for network-refactor merge
 2013-01-17 17:00:24 -08:00
Chiradeep Vittal
2d19f3b052 network-refactor: merge stomped on a logical not' 2013-01-17 16:59:48 -08:00
Rohit Yadav
8d016d035b MockConfigurationDaoImpl: Fix build issue, add base class method 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 16:15:15 -08:00
Rohit Yadav
cafe881acb maven: Fix deploydb in developer/pom.xml to pass through DatabaseCreator 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 16:10:07 -08:00
Rohit Yadav
ef07cde449 DBCreator: Fix ScriptRunner to strip comments, reformat code 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 16:10:07 -08:00
Kelven Yang
6d155416c2 System VM can start now with Spring bootstraped management server 2013-01-17 14:22:14 -08:00
Marcus Sorensen
e37a82375c Summary: Fix rp_filter for VPC router 
Detail: VPC router was being treated like normal VR, which was an issue because
normally the VR has an eth0,1,2 which are isolated, linklocal, and public
networks respectively. rp_filter is turned on for eth0,1 and off for 2
(hardcoded). VPC however comes up with eth0,1 as public, linklocal, and no other
interfaces until new isolated networks are added, so the process doesn't work.
This change turns on rp_filter as new isolated networks are added to the VR.

BUG-ID: CLOUDSTACK-938
Bugfix-for: 4.0.2
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358451991 -0700
 2013-01-17 12:51:38 -07:00
Chiradeep Vittal
56cd809600 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 
Re-merge with network-refactor
 2013-01-17 11:32:49 -08:00
Edison Su
0b60c0d3c9 CLOUDSTACK-995: fix failed to detect centos 6.2 2013-01-17 11:05:03 -08:00
Marcus Sorensen
8c5b82dfb4 Summary: several scripts are not mode executable 
Detail: several scripts in the scripts directory weren't marked executable.
Normally this is handled/fixed in the packaging, but harder to deal with in
development environments, so marking them executable.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358446902 -0700
 2013-01-17 11:21:42 -07:00
Marcus Sorensen
b77503b5bd Summary: fix ipsectunnel.sh being called as ipsectunnel in KVM S2S vpn 
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358446796 -0700
 2013-01-17 11:19:56 -07:00
Marcus Sorensen
1ff7a147bd Revert "Summary: fix ipsectunnel.sh being called as ipsectunnel in KVM S2S vpn" 
This reverts commit 1a2e69fb22a64b84960860965d4f757637ac5e12.
accidentally pushed mode change of sh file as well, need to split this out
 2013-01-17 11:17:43 -07:00
Marcus Sorensen
1a2e69fb22 Summary: fix ipsectunnel.sh being called as ipsectunnel in KVM S2S vpn 
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358446410 -0700
 2013-01-17 11:13:30 -07:00
Alex Huang
cbb7ff1c32 added missing files 2013-01-17 06:50:59 -08:00
Alex Huang
b751b69c55 Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin 2013-01-17 06:50:19 -08:00
Alex Huang
9759ad57f2 Commit the current changes to unit tests 2013-01-17 06:50:11 -08:00
Min Chen
3dabd5fbf3 Clean up ApiServer, ApiServlet and ApiDispatcher flow to handle various CloudRuntimeException 
and CloudException in one place, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-16 22:36:34 -08:00
Chiradeep Vittal
d9e36ac37b network-refactor: fix license issues 
Fix build after merge of network-refactor
 2013-01-16 19:25:23 -08:00