Commit Graph

101 Commits

Author SHA1 Message Date
Chip Childers a5a7105b36 Updating pom.xml version numbers for release 4.1.0-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 19:51:20 -04:00
Chip Childers 7048baaa44 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 19:45:20 -04:00
Chip Childers 818a2c86d8 Revert "Updating pom.xml version numbers for release 4.1.0"
Backing out versions to 4.1.0-SNAPSHOT
This reverts commit b7abc3ca1e.
2013-04-22 22:22:32 +01:00
Chip Childers a3c6ab58a1 Revert "Updating pom.xml version numbers for release 4.1.1-SNAPSHOT"
Backing out versions to 4.1.0-SNAPSHOT
This reverts commit 8fe99e6453.
2013-04-22 22:22:06 +01:00
Chip Childers 8fe99e6453 Updating pom.xml version numbers for release 4.1.1-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 12:46:11 -04:00
Chip Childers b7abc3ca1e Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 09:42:23 -04:00
Chip Childers d168119a89 Revert "Updating pom.xml version numbers for release 4.1.0"
Reverting for yet another attempted RC

This reverts commit b654578bd5.
2013-04-22 09:35:21 -04:00
Chip Childers ca3b515bad Revert "Updating pom.xml version numbers for release 4.1.1-SNAPSHOT"
Reverting for yet another attempted RC.
This reverts commit 5a923ca44d.
2013-04-22 09:35:06 -04:00
Chip Childers 5a923ca44d Updating pom.xml version numbers for release 4.1.1-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 09:20:20 -04:00
Chip Childers b654578bd5 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 08:55:21 -04:00
Chip Childers e119a53bfd Revert "Updating pom.xml version numbers for release 4.1.0"
Reverting to re-spin 4.1.0 RC

This reverts commit b25d27d80b.
2013-04-22 08:52:17 -04:00
Chip Childers 5755f6e3e8 Revert "Updating pom.xml version numbers for release 4.1.1-SNAPSHOT"
Reverting so that I can re-spin the 4.1.0 RC

This reverts commit c8c77f6b1c.
2013-04-22 08:51:58 -04:00
Chip Childers c8c77f6b1c Updating pom.xml version numbers for release 4.1.1-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-21 16:26:50 -04:00
Chip Childers b25d27d80b Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-21 16:18:04 -04:00
Pascal Borreli 531bb6c175 Fixed Primary typo 2013-04-12 20:13:14 +01:00
Chip Childers 6a5f61a487 Revert "Fixed Primary typo"
This reverts commit 322eae5429.
2013-04-12 15:27:37 +01:00
Pascal Borreli 322eae5429 Fixed Primary typo 2013-04-12 14:11:10 +01:00
Pascal Borreli 00d3bc59db Typos fixed
Few typo fixed
2013-04-11 18:52:09 +09:00
Sheng Yang 0760fdf6d0 CLOUDSTACK-1332: Add IPv6 DNS for Zone 2013-02-25 16:07:14 -08:00
Kelven Yang 4f38d745b8 CLOUDSTACK-1339: Using Sping interface injection pattern to avoid using CGLIB proxying mode. Spring with CGLIB proxying will concflict with CGLIB usage in CloudStack DB code, CloudStack CGLIB usage can cause Spring to lose tack of its proxied object and therefore creates a massive amount of objects in memory 2013-02-24 13:31:42 -08:00
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