apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,864 Commits 304 Branches 324 Tags
Commit Graph

1257 Commits

Author SHA1 Message Date
Kelven Yang
296c20332d Merge javelin into master 2013-02-01 14:40:45 -08:00
Kelven Yang
7b75f0d990 Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
Likitha Shetty
13ee8d1865 Persistent Networks support 
Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
 2013-02-01 15:10:06 +05:30
Kishan Kavala
fc925022bd Upgrade changes for Region schema. Made region_id not null 2013-02-01 13:49:57 +05:30
Kanzhe Jiang
736b236eaf bigswitch controller support 
Reviewed-by: Chiradeep Vittal <chiradeepv@gmail.com>

Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
 2013-02-01 12:42:04 +05:30
Kishan Kavala
9ea90c3359 Merge branch 'master' into regions 
Conflicts:
	client/tomcatconf/components.xml.in
	server/src/com/cloud/api/ApiResponseHelper.java
 2013-02-01 11:38:16 +05:30
Kishan Kavala
33b87d8985 CLOUDSTACK-686: Modified unique constraint to include physical_network_id 2013-02-01 07:54:31 +05:30
Kelven Yang
7bd8bec68a Sync javelin with master up to 894cb8f7d9fc8b5561754a9fa541fef8f235148a 2013-01-31 17:20:19 -08:00
Sheng Yang
5cb9df91a1 Merge branch 'ipv6' 
Conflicts:
	api/src/com/cloud/network/NetworkProfile.java
 2013-01-31 15:07:33 -08:00
Kishan Kavala
8b1a5b1de2 - Separated RegionServiceImpl and RegionManagerImpl 
- Added comments
- Changed package name to org.apache.cloudstack.region
 2013-01-31 18:08:20 +05:30
Sheng Yang
ed547d91f7 IPv6: Rename public_ipv6_address to user_ipv6_address 2013-01-30 17:05:47 -08:00
Kishan Kavala
d3089ba2a5 Merge branch 'master' into regions 2013-01-29 11:50:49 +05:30
Kishan Kavala
158ee8b2fa Add sync entry to region_sunc table on region api failure 2013-01-29 11:49:23 +05:30
Kishan Kavala
def9fd1f2e remove finduser, findaccount, finddomain APIs 2013-01-28 17:04:25 +05:30
Rohit Yadav
2fb346ab62
Merge branch 'master' into javelin 2013-01-27 05:20:49 -08:00
Sheng Yang
bd4bc025d1 IPv6: Accept IPv6 parameter for createNetworkCmd 
Also ass public_ipv6_address for ipv6 address management.

Extend nics and vlans for ipv6 address.

Add dependency to com.googlecode.ipv6(java-ipv6).

Modify dhcpcommand for ipv6.
 2013-01-26 23:14:15 -08:00
Kishan Kavala
c6ae19d12f Merge branch 'master' into regions 2013-01-25 18:49:47 +05:30
Kishan Kavala
1f57d925eb Apply API refactoring changes. Make changes to Regions API to work with new code 2013-01-25 18:41:59 +05:30
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
Alex Huang
8e2a96923c delete some old sql files 2013-01-23 17:18:54 -08:00
Min Chen
285e8213fe Add DB index to Alert.last_sent column to speed up listAlertsCmd. 2013-01-23 12:38:37 -08:00
Min Chen
26be5ce2df CLOUDSTACK-355: create DB view for ZoneResponse to fix count for 
listZonesByCmd.
 2013-01-22 16:39:45 -08:00
Edison Su
c921118c58 add image create test case 2013-01-22 13:25:48 -08:00
Prachi Damle
1cb0ce44df Removing BareMetalService referrences. We will load UserVMService by default. 2013-01-22 12:54:20 -08:00
Prachi Damle
3cc9f3ff06 Adding defaults to new columns 2013-01-22 12:54:12 -08:00
Prachi Damle
ef4d04f289 Removing the alter table statement - data_center already has a removed column 2013-01-22 12:54:09 -08:00
Prachi Damle
e6cd47ddc0 More changes for deployVM flow. 2013-01-22 12:54:07 -08:00
Prachi Damle
94e8090bf3 Deploy, Start, Stop, Destroy VM orchestration service changes 2013-01-22 12:54:04 -08:00
Min Chen
2130a418e0 Formatting db view sql creation, and also addressed FIXME in Hugo's 
change.
 2013-01-22 10:08:57 -08:00
Hugo Trippaers
3bac7b8c07 Summary: Fix schema-40to410.sql 
Applied some formatting

Changed invalid comment

Added workaround for non existing table vm_template_iso

Fix non prefixed table names in views

Removed 'use cloud' statement
 2013-01-22 11:01:22 +01:00
Edison Su
4fbecf15ec add unit test back, primary storage life cycle is tested 2013-01-21 17:01:00 -08:00
Min Chen
6e40c33628 CLOUDSTACK-355: create DB view for ServiceOfferingResponse to fix count 
for ListServiceOfferingsCmd.
 2013-01-21 15:25:49 -08:00
Min Chen
6db719d58b CLOUDSTACK-355: Create DB view to fix count issue for 
listDiskOfferingsCmd.
 2013-01-21 10:50:10 -08:00
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
Alex Huang
10d9c019a9 All merge conflicts resolved 2013-01-18 12:14:57 -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
Marcus Sorensen
975021dda1 Summary: adding resizeVolume api call 
Detail: This merges the resizevolume feature branch, which provides the
ability to migrate a disk between disk offerings, thereby changing its
size, or specifying a new size if current disk offering is custom.

BUG-ID: CLOUDSTACK-644
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358358209 -0700
 2013-01-16 17:43:35 -07:00
Murali Reddy
c7840cf91f reverting the earlier commit 432ea9c7d4aff3f7e682f2951f49ed3e95778d9f 
done for bug CLOUDSTACK-265 due to IP clearence issues.
 2013-01-16 15:10:27 +05:30
Wido den Hollander
95222cdb6d Templates: Add Ubuntu 12.04 to the templates 
Although I still think the templates aren't well maintained, I just
added 12.04 since this is an LTS and people probably want it in the
list of templates.

This system should be more generic I think though.
 2013-01-15 13:25:48 +01:00
Rohit Yadav
fdc9103fbe create-schema: Fix deploydb, drop existing (new) tables 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-12 03:43:35 -08:00
Prachi Damle
ad2cd775e0 fixing errors 2013-01-09 11:00:18 -08:00
Alex Huang
b6c56736e5 merge from master 2013-01-09 05:20:36 -08:00
Alex Huang
14bd345f1f merge compiles 2013-01-09 04:41:27 -08:00
Min Chen
d22229eb9d Remove updateUuids code in ConfigurationServerImpl (which is not the 
right approach to populate uuid column since it will impact upgrade as
well), and populate UUID column in seed data sql script.

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-08 17:12:14 -08:00
Alex Huang
30f2565d98 Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00
Min Chen
74c15a22a0 Create DB view for ListStoragePools API performance optimization. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-08 12:33:18 -08:00
Prachi Damle
a4f4c98670 OrchestrationService: some changes for DeployVM 2013-01-08 11:53:54 -08:00
Min Chen
0894822651 DB view dao cleanup, and introduce global configuration parameter for 
entity detail batch query size to remove hard-coded
VM_DETAILS_BATCH_SIZE.

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-07 16:40:31 -08:00