92 Commits

Author SHA1 Message Date
Sheng Yang
1b408509d6 CLOUDSTACK-1332: Add IPv6 DNS for Zone 2013-02-25 16:08:10 -08:00
Edison Su
3bb713c5ce fix adding nfs primary storage and build and load 2013-02-21 16:24:39 -08:00
Chip Childers
6cc1123a3e Correcting license headers that broke the build
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-02-21 16:29:05 -05:00
Edison Su
ae902590d3 fix snapshot 2013-02-21 11:22:50 -08:00
Edison Su
fb4036ece4 add test folder for snpahost project 2013-02-21 11:22:49 -08:00
Edison Su
0f532c4b3a rebase to master 2013-02-21 11:22:49 -08:00
Edison Su
ff047e75d3 refactor snapshot, move existing snapshot code into its own snapshotstrategy 2013-02-21 11:22:49 -08:00
Edison Su
020be66f9d add copy volume and create volume from snapshot 2013-02-21 11:22:49 -08:00
Edison Su
621a779446 use correct disk offering id 2013-02-21 11:22:49 -08:00
Edison Su
a22403edcd squash changes into one giant patch 2013-02-21 11:22:48 -08:00
Rohit Yadav
80d58b6c73 CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:56 +05:30
Kelven Yang
7b75f0d990 Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
Kelven Yang
176523254e Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
Kelven Yang
1450547987 Put usage server under Spring 2013-01-25 23:00:55 -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
45a92ba369 Fix the initialization of management server 2013-01-23 15:29:41 -08:00
Prachi Damle
e5bf16b00f Fixing error with merge 2013-01-22 16:44:28 -08:00
Edison Su
e4e2cf6be7 skip test in cloud engine 2013-01-22 13:25:48 -08:00
Edison Su
c921118c58 add image create test case 2013-01-22 13:25:48 -08:00
Edison Su
4fbecf15ec add unit test back, primary storage life cycle is tested 2013-01-21 17:01:00 -08:00
Edison Su
3251cd665b add test case for create storage pool 2013-01-21 16:59:51 -08:00
Edison Su
b4988e86ab add backedn code 2013-01-21 16:59:50 -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
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
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
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
Kelven Yang
df684261cf Put command classes under Spring injection framework 2013-01-15 18:07:19 -08:00
Edison Su
c93918a896 rename dataobject to datastream 2013-01-15 15:46:21 -08:00
Edison Su
8af85b04d0 refactor api, based on suggestion from community 2013-01-14 18:52:39 -08:00
Rohit Yadav
9faf00bdc8 Fix license on xml.in, jsp and ucls files on javelin
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 06:34:34 -08:00
Rohit Yadav
ea3f5ecb54 Fix license for xml files in javelin
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 06:31:47 -08:00
Rohit Yadav
ba20e7f85a Fix license headers for java files in javelin
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 06:27:09 -08:00
Rohit Yadav
38eaa04b98 Pull changes from master into javelin
- Disables simulator plugin, breaks build, available via simulator profile
- Fixes spring injections
- Fix api,acl plugins, ApiServer, ApiDispatcher
- Fix other merge conflicts

Conflicts:
	docs/en-US/external-firewalls-and-load-balancers.xml
	plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 06:02:54 -08:00
Kelven Yang
53da542001 Another round of fixes after merge 2013-01-11 15:21:04 -08:00
Alex Huang
f922c6fc03 Keep removing 2013-01-10 14:46:52 -08:00
Alex Huang
56e5fbdee2 removed import of componentlocator and inject from all files 2013-01-10 11:44:47 -08:00
Alex Huang
395de6f2b3 merge from latest pull 2013-01-10 11:07:11 -08:00
Alex Huang
f40e7b7511 removed componentlocator and inject 2013-01-10 11:05:20 -08:00
Edison Su
a03d83bba9 refactor the motion service api 2013-01-10 10:27:05 -08:00
Alex Huang
14bd345f1f merge compiles 2013-01-09 04:41:27 -08:00
Kelven Yang
32e67f60d4 Work with Spring proxy-ed object 2013-01-08 14:24:19 -08:00
Edison Su
2d6133c61e change the top level async call using future 2013-01-04 17:17:57 -08:00
Edison Su
9410cd1f3c add deletevolume and createdata disk 2013-01-03 18:56:18 -08:00
Prachi Damle
1eb64e6181 ProvisioningService:: registerZone changes and unit-test 2013-01-03 11:44:36 -08:00
Edison Su
d7bc09f950 fix build 2013-01-03 11:35:41 -08:00
Edison Su
e40042b554 refactor volumeservice api 2013-01-02 18:42:48 -08:00
Edison Su
ce2120d09d fix build 2013-01-02 17:43:55 -08:00
Edison Su
5d1e97e407 add create volume 2013-01-02 17:32:54 -08:00