frank 428f8ae152 add missing jar for awsapi as maven dependency ...

Fixed conflicts between:
2f9941d85f8277f1fb2cbf958e41afb3fcd6960b
5c3ec1541040ecc9d1f1da240b38eed0c4802632

on:
awsapi/pom.xml

2012-10-09 18:38:54 +05:30

..

.gitignore

License header updates for the build folder.

2012-08-01 11:36:10 -04:00

build-aws-api.properties

License header updates for the build folder.

2012-08-01 11:36:10 -04:00

build-aws-api.xml

add missing jar for awsapi as maven dependency

2012-10-09 18:38:54 +05:30

build-cloud-plugins.xml

CLOUDSTACK-57, CLOUDSTACK-14

2012-09-12 20:47:20 -07:00

build-cloud.properties

Make inclusion of cloud-vmware.jar in systemvm.iso conditional

2012-08-24 16:03:22 +02:00

build-cloud.xml

CLOUDSTACK-57, CLOUDSTACK-14

2012-09-12 20:47:20 -07:00

build-common.xml

Introduced plugins directory.

2012-06-19 18:27:09 -07:00

build-devcloud.xml

add trust="yes" option to ssh tasks

2012-07-10 17:05:10 -07:00

build-docs.xml

Replaced Cloud.com & Citrix copyright notices with the Apache Software License, Version 2.0.

2012-06-12 09:03:36 -04:00

build-marvin.xml

failonerror for some marvin targets

2012-07-31 12:17:33 +05:30

build-tests.xml

fix simulator build

2012-08-16 16:01:30 -07:00

build-usage.xml

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

cloud.properties

[ASFCS40] Updated version number to reflect 4.0.0

2012-08-14 22:54:44 -07:00

developer.xml

[CLOUDSTACK-283] Add Nicira NVP calls to the api docs

2012-10-08 23:07:43 +05:30

overview.html

License header updates for the build folder.

2012-08-01 11:36:10 -04:00

package.xml

CLOUDSTACK-57, CLOUDSTACK-14

2012-09-12 20:47:20 -07:00

release-notes

more line ending fixes

2012-04-06 22:51:32 -04:00

replace.properties

License header updates for the build folder.

2012-08-01 11:36:10 -04:00

simulator.properties

License header updates for the build folder.

2012-08-01 11:36:10 -04:00