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,712 Commits 307 Branches 324 Tags
Commit Graph

15712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kelven Yang
b5deb52fba Put a tempoary fix to awsapi to workaround an issue with jetty/Spring integration limitation 2013-01-28 17:45:16 -08:00
Kelven Yang
8887f01b37 CLOUDSTACK-1070: HypervisorTemplateAdapter needs to be configured with proper name 2013-01-28 17:12:41 -08:00
Rohit Yadav
7ea83b82e6 cli: Show filter only when a subject is specified in autocompletion 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-28 16:30:04 -08:00
Prachi Damle
2bfdce02f1 Spring changes in awsapi 2013-01-28 16:01:50 -08:00
Rohit Yadav
4c1a69ac33 client: Fix maven to replace nonoss spring ctx xml for nonoss build 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-27 05:40:17 -08:00
Rohit Yadav
2fb346ab62
Merge branch 'master' into javelin 2013-01-27 05:20:49 -08:00
Noa Resare
7d40a7e500 Make maven use mkisofs or genisoimage depending on what is available 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-27 04:48:47 -08:00
Rohit Yadav
6c527ffbba cli: Fix cachegen aand cloudmonkey to generate api verbs, revert last commit 
Fixes cachegen and reverts "mvn: fix cloudmonkey build"

This reverts commit 6d3de41d4262abeedab234a08e8fb5714b69a9bf.
 2013-01-27 04:18:31 -08:00
Prasanna Santhanam
6d3de41d42 mvn: fix cloudmonkey build 
removing cachegen.py that is no longer required for execution

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-01-27 14:49:50 +05:30
Rohit Yadav
ddb794d960 cli: generate verbs on the fly, fix autocompletion whitespace bug 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-26 17:14:09 -08:00
Pranav Saxena
1509a210ca Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2013-01-26 23:48:57 +05:30
Isaac Chiang
76b28805e6 CloudStack-965: When a detailview action is prohibited, the operation dialog box should not show up in the mean time 2013-01-26 23:46:44 +05:30
Rohit Yadav
a4c778e115 test_vm_life_cycle: Don't wait a lot poll for change every expunge_cycle interval 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-25 23:40:01 -08:00
Kelven Yang
1450547987 Put usage server under Spring 2013-01-25 23:00:55 -08:00
Rohit Yadav
221ac72a2e test_vm_life_cycle: Consider 600s threshold for expunge.delay as per server logic 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-25 19:01:23 -08:00
Rohit Yadav
bc40ed85e5 test_vm_life_cycle: Fix expunging logic as in mgmt server 
Sets expunge interval to 600 if it's less than that

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-25 17:43:37 -08:00
Kelven Yang
767f54cc9a Make nonoss build work under Spring 2013-01-25 17:18:36 -08:00
Kelven Yang
2b67fc8441 Add nonossComponentContext.xml.in for nooss composition of CloudStack 2013-01-25 15:48:25 -08:00
Kelven Yang
af4485ae9e Put nonoss under Spring framework 2013-01-25 15:41:48 -08:00
Min Chen
fc7d07305f Fix a bug in listHosts that returns wrong zoneId for host.(cherry picked from commit 17c419ceb4979ebef0cb756ad6ed15e5c95dfbd4) 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-25 14:21:41 -08:00
Min Chen
17c419ceb4 Fix a bug in listHosts that returns wrong zoneId for host. 2013-01-25 14:18:25 -08:00
Min Chen
2c9e314477 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2013-01-25 14:15:22 -08:00
Edison Su
e9bca76a32 set local storage as up 2013-01-25 13:07:36 -08:00
Edison Su
a18baf8c83 fix compile 2013-01-25 10:24:25 -08:00
Brian Federle
8f11f631a4 Instance wizard: Fix back button state 
Fix case where select SG step is shown on back, instead of select guest network.
 2013-01-25 08:58:07 -08:00
Kishan Kavala
0ab39fd162 added missing bracket 2013-01-25 19:32:30 +05:30
Pranav Saxena
44ceff4224 CLOUDSTACK-1064:A type error occurs when trying to add account/register template: this is because of accounts conext being undefined 2013-01-25 16:42:42 +05:30
Pranav Saxena
9deea9bb55 CLOUDSTACK-1063:SG Enabled Advanced Zone -Add Guest Networks- When user tries to add a guest Network with scope as Account , he should NOT be presented with Offering for shared security group enabled 2013-01-25 15:49:29 +05:30
Edison Su
cb25eed37a forget to check in code 2013-01-25 00:25:14 -08:00
Prachi Damle
df5c4c3048 Fixing VPC unit test to use Spring 2013-01-24 23:05:31 -08:00
Radhika PC
25c0d84c16 Document procedure to choose default System Offering for System VMs 
Signed-off-by: Radhika PC <radhika.puthiyetath@citrix.com>
 2013-01-24 21:32:46 -06:00
Rohit Yadav
f56b96ad19 merge: Fast forward merge branch 'javelin' 
FF merge commit due to recent merge of master and then Edison's commit.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-24 19:30:28 -08:00
Rohit Yadav
356866c72b Merge branch 'master' into javelin 
- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
	api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
	api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
	plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/swift/SwiftManagerImpl.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-24 19:18:53 -08:00
Edison Su
6f5655cb03 generalize storage orchestration: DataObjectManager will handle all the object life cycle management 2013-01-24 18:30:08 -08:00
Kelven Yang
f8e5740c31 A workaround to injection problems in servlets (ConsoleProxyServlet and RegisterCompletionServlet) classes 2013-01-24 18:04:48 -08:00
Rohit Yadav
b63b7ddf60 UserContext: Threadsafe singleton, inject using ComponentContext, spring di failsafe 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-24 17:00:12 -08:00
Min Chen
4ccbdbd23d Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2013-01-24 16:46:10 -08:00
Min Chen
b6f780fa33 Fix StoragePool unit testcase. 2013-01-24 16:11:35 -08:00
Min Chen
f85ac65645 Fix Snapshot unit testcase. 2013-01-24 16:05:03 -08:00
Rohit Yadav
e5b23e387d AccountManagerImpl: Fix method to check and return systemuser, spring injection failsafe 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-24 15:41:04 -08:00
Rohit Yadav
753b884044 spring: Fix component annotation for VolumeDaoImpl and CfgServerImpl 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-24 15:40:40 -08:00
Brian Federle
a2b2d45e40 Conditionally show select SG step 
Only show select security group step if at least one guest network
with SecurityGroup service is selected.
 2013-01-24 14:57:43 -08:00
Rohit Yadav
6f90a86b13 cli: fix cloudmonkey's pipe-ability 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-24 14:47:45 -08:00
Alex Huang
1567a112fa unit test works again 2013-01-24 14:36:44 -08:00
Rohit Yadav
71257d6bb4 cli: give filter option only when output 'tabularized' is enabled 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-24 11:28:49 -08:00
Rohit Yadav
531c2f030c api: Fix annotations on iso related cmd 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-24 10:33:04 -08:00
Pranav Saxena
f1aee2cc50 CLOUDSTACK-1029:Enter the token to specified project is malfunctioned 2013-01-24 14:13:53 +05:30
Kelven Yang
a26e075f0e Remove final modifer to ListS3Cmd class as it conflicts with Spring injection 2013-01-23 18:24:03 -08:00
Rohit Yadav
afb7e289fe cli: Fix development status to stable. cloudmonkey v1 at its most stable form 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 18:15:51 -08:00
Prachi Damle
d182e64897 GenericDao maintains a map of VO interface -> DaoImpl. Since cloud-engine is not yet a separate service, we need to introduce dummy interfaces to load both CloudStack API daoImpls and engine daoImpls 2013-01-23 17:59:15 -08:00