etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,772 Commits 323 Branches 325 Tags 976 MiB
Commit Graph

221 Commits

Author SHA1 Message Date
Edison Su 3ae4a34e50 Merge branch 'master' into 4.0 
Conflicts:
	debian/cloud-scripts.install
 2012-09-14 14:13:01 -07:00
Jie Feng c9aa08350a [DOC] docbook conversion - choosing a deployment architecture 2012-09-13 16:12:06 -04:00
Edison Su 5e3921519a CLOUDSTACK-57, CLOUDSTACK-14 
remove unnecessary build/deploy folder, and add CAStorSDK-1.3.1-CS40.jar into rpm/deb build system

Conflicts:

	debian/cloud-deps.install
	wscript_build
 2012-09-12 20:47:20 -07:00
Chiradeep Vittal 651ac2a83b Fix ant debug developer target. The excluded jars in /usr/local/apache-tomcat-6.0.32/lib either conflict with the ones in awsapi webapp or the slf4j jars cause an infinite class loading loop 2012-09-12 15:51:03 -07:00
David Nalley ff58e05c40 fixing apidocs build 2012-09-12 18:18:41 -04:00
David Nalley 6ac3cf9c70 fixing apidocs build 2012-09-12 18:18:19 -04:00
Edison Su c7ff8a0e56 Merge branch 'master' into 4.0 2012-09-11 23:31:26 -07:00
Edison Su f93dd21602 fix ant debug 2012-09-11 20:24:29 -07:00
Prachi Damle 6ead90ab3b CLOUDSTACK-53: CloudBridge installation pieces present, deprecated? 
CLOUDSTACK-51: Outdated docs and license data present in awsapi

Removing content that is not used by awsapi.
 2012-09-11 15:17:20 -07:00
Edison.Su 653cdb3c5d CLOUDSTACK-64: remove junit 2012-09-10 23:15:05 -04:00
Edison.Su 98ab449bd0 don't compile xenapi 2012-09-10 22:35:06 -04:00
Alex Huang 9095f0b268 Fixed build for windows 2012-09-10 17:21:34 -07:00
Alex Huang 9c7ae1eadc Fixed build for windows 2012-09-10 17:20:39 -07:00
Alex Huang 90bf6c4941 Pulled the latest from master 2012-09-10 13:55:34 -07:00
Chip Childers bdfb36d500 Changed the location from which to pull the mar files during deploy-server 2012-09-10 16:05:50 -04:00
Chip Childers b1ae7c732c Partial fix for awsapi deploy-server issues that I introduced when trying to fix CLOUDSTACK-26 2012-09-10 14:42:08 -04:00
Mice Xia 03df2fa9dd CLOUDSTACK-50 build-apidocs ClassNotFoundException: com.cloud.api.commands.DeleteCiscoNexusVSMCmd 2012-09-08 17:37:24 +08:00
Mice Xia 0ae1d58c19 CLOUDSTACK-50 build-apidocs ClassNotFoundException: com.cloud.api.commands.DeleteCiscoNexusVSMCmd 2012-09-08 10:56:32 +08:00
Edison.Su dd41bedcb6 fix ant deploy-server 2012-09-07 21:25:20 -04:00
Edison.Su 8beae8894d fix ant deploy-server 2012-09-07 21:21:19 -04:00
Edison.Su 7502df6120 CLOUDSTACK-58: remove deprecated release notes 2012-09-07 20:20:13 -04:00
Edison.Su 558994305b CLOUDSTACK-57, CLOUDSTACK-14 
remove unnecessary build/deploy folder, and add CAStorSDK-1.3.1-CS40.jar into rpm/deb build system
 2012-09-07 20:01:11 -04:00
Anthony Xu f9e91a9f96 Removing the older xenapi jar and adding an ant target to build one from the source. 
provided-by : Devdeep Singh
 2012-09-07 16:31:47 -07:00
Edison Su fda4bac6e7 fix systemvm zip 2012-09-07 05:12:38 -07:00
Edison Su b88033ff2a fix installation issue 2012-09-07 05:12:27 -07:00
Edison Su 08c970a9ca fix systemvm zip 2012-09-07 02:22:20 -07:00
Edison Su f1bd52917d fix installation issue 2012-09-07 01:09:27 -07:00
Edison Su f26929bf2d add kvm into rpm 2012-09-06 11:41:01 -07:00
Prachi Damle f57f96f7b7 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-09-06 11:23:50 -07:00
Prachi Damle e73d4334d1 - Removing the AWS wsdl file 
- Adding license to the services.xml
 2012-09-06 11:23:13 -07:00
Edison Su 5ae15f8bbf first OSS build 2012-09-05 17:45:25 -07:00
Hugo Trippaers 856958a784 Don't fail on execution of mvn as it is just a convenience function 2012-08-31 22:04:15 +02:00
Hugo Trippaers 9789e934b6 Fix the awsapi build by downloading the correct dependencies 
Use maven to download all dependencies for the ant build, just make sure mvn is in the path
 2012-08-31 21:41:16 +02:00
Rajesh Battala 39aa7d86af Moved Awsapi (EC2/S3) from Hibernate framework to CloudStack Generic Dao Framework 
Created/Modified new VO's and Dao Impl classes to use Generic Dao Framework
 2012-08-31 11:44:58 -07:00
Gavin Lee 39a676c496 Correct license header mainly for patches folder 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
I've assumed that Gavin's commit is appropriate, based
on an assumption that we will keep these files in the source
tree.  If https://issues.apache.org/jira/browse/LEGAL-146
results in a different opionion from the members, then we
will end up having to do something more drastic anyway.
 2012-08-31 10:50:46 -04:00
Hugo Trippaers 3c63a39fa4 Make sure that jenkins can find the mysql connector jar 2012-08-31 12:28:03 +02:00
Hugo Trippaers b1d52c4404 Make inclusion of cloud-vmware.jar in systemvm.iso conditional 2012-08-24 16:03:22 +02:00
Kishan Kavala d05106053a fixed run-usage and debug-usage targets, deploy missing usage-components.xml and log4j-cloud_usage.xml 2012-08-24 16:59:20 +05:30
Ewan Mellor df7b12042a Fix build-usage targe 2012-08-24 16:30:23 +05:30
Prachi Damle 511e3cb235 [ASFCS40]CS-15373: Awsapi port change to 7080. 
Reviewed-By: Frank

Changes:
- Changes to deploy awsapi in separate webapps folder and listeining on 7080 port
- Revert changes which were done to open 7080 on CloudStack

Conflicts:

	awsapi/conf/cloud-bridge.properties
	client/tomcatconf/server-ssl.xml.in
 2012-08-21 16:27:55 -07:00
David Nalley 16437df9bd commenting out the copy statement for mysql-connector-java so the test doesn't break 2012-08-20 14:19:37 -04:00
Edison Su 45f514ce7c fix simulator build 2012-08-16 16:01:30 -07:00
John Kinsella 6a41965b70 [ASFCS40] Updated version number to reflect 4.0.0 2012-08-14 22:54:44 -07:00
Murali Reddy 1eec6fa262 fix to stop building plug-ins from the build-opensource target. 
All plug-ins get built-by target build-plugin. Only build-all depeneds on build-plugins target.
 2012-08-13 18:23:49 +05:30
Mice Xia 886f470270 include cloud-ejb-api-3.0.jar in systemvm.zip 2012-08-09 17:28:30 +08:00
Edison Su 9e1b8caec4 need to build vmware before creating systemvm.zip 2012-08-08 11:13:15 -07:00
Alex Huang a6a864a1a8 Removed Base64 file and use the apache version 2012-08-07 15:41:54 -07:00
Edison Su 3996094e55 Fix bug: can not deploy VM on ESXi due to incorrect 
secondaryStorageResource used for SSVM

Issue:
For deploying VMware VMs, cloud service on SSVM needs to be started with
PremiumSecondaryStorageResource, a bunch of VMware related commands rely
on it.

Changes:
1)include cloud-vmware.jar in systemvm.zip
2)start cloud service in SSVM with PremiumSecondaryStorageResource

RB: https://reviews.apache.org/r/6320/
Send-by: mice_xia@tcloudcomputing.com
 2012-08-02 11:20:35 -07:00
Edison Su e116c24989 Removed obsolete file SearchCriteria2Test.java which caused ant unittest 
to fail.
cleanup.sql cleans up CLOUD and CLOUD_USAGE databases which are required
by many unit-testcases.
RB: https://reviews.apache.org/r/6283/diff/3/
Send-by: saksham.srivastava@citrix.com
 2012-08-02 10:33:06 -07:00
Edison Su 3a184a1b49 remove the unused files 2012-08-01 13:57:33 -07:00