13495 Commits

Author SHA1 Message Date
Edison Su
f93dd21602 fix ant debug 2012-09-11 20:24:29 -07:00
Hiroaki Kawai
b3d4246a14 typo in cloud-install-sys-tmplt 2012-09-11 18:37:24 -07:00
Alena Prokharchyk
c876a66b3f Fixed unittest 2012-09-11 17:26:20 -07:00
Alena Prokharchyk
f5c9397327 CS-16187: don't allow vpc offering creation with unsupported services (Firewall, SecurityGroup)
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-09-11 17:05:04 -07:00
Alena Prokharchyk
d0c526fdcd Replaced tabs with spaces in VirtualNetworkApplianceManagerImpl (tabs were used mostly in network stats related code) 2012-09-11 17:03:11 -07:00
Fang Wang
6fd7da8f56 Keep the instance-id and vm-id values prior to Acton, use UUID for VMs created poast Acton. 2012-09-11 17:03:11 -07:00
Likitha Shetty
cc80d09d77 CS-14796: Error out with InvalidParameterValueException in UserVmManagerImpl if userdata is not base64 encoded. 2012-09-11 16:58:09 -07:00
Prachi Damle
bfcc31d9ed CLOUDSTACK-51: Outdated docs and license data present in awsapi
CLOUDSTACK-53: CloudBridge installation pieces present, deprecated?
2012-09-11 15:26:28 -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
Alena Prokharchyk
acd08e61e6 CS-16239: don't try to pull key information if the key was removed in the system
As a part of the commit, also checking deleteSshKeyPair name - admin was unable to delete the key on behalf of another user

Conflicts:

	server/src/com/cloud/api/ApiDBUtils.java
2012-09-11 14:37:25 -07:00
Pranav Saxena
6949b40c94 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-09-11 21:32:35 +05:30
Radhika Puthiyetath
a19c962bf5 Feature Documentation for s2svpn interVlan Reviewed-By:Jessica Tomechak 2012-09-11 21:31:51 +05:30
Wido den Hollander
a572e59411 debian: Remove *.conffiles files
By default any file in /etc is a conffile according to dh_installdeb compat >= 3
2012-09-11 17:47:09 +02:00
Wido den Hollander
0af8606581 debian: Add the MySQL connector to the classpath
This JAR is installed through a dependency, but it needs to be added to the classpath.
2012-09-11 17:33:18 +02:00
Wido den Hollander
ecea6bec8c waf: Remove jnetpcap.jar from the common JAR files
jnetpcap got removed some time ago with commit:e7995d09dce78434cce530b0428bcf69f00ff066
2012-09-11 17:29:01 +02:00
Wido den Hollander
d4ca7361c1 debian: Add two JAR files to cloud-deps
These are not available through the Ubuntu or Debian repositories
2012-09-11 16:42:39 +02:00
Hiroaki Kawai
739d4baf55 Patch from kawai@stratosphere.co.jp to resolve a Fedora dependency issue.
https://reviews.apache.org/r/7009/
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-09-11 10:13:52 -04:00
Wido den Hollander
0429cce9e5 debian: Update locations where to search for Java under Ubuntu and Debian 2012-09-11 15:22:17 +02:00
Wido den Hollander
93126414bc debian: Get backport-util-concurrent from the Debian repositories 2012-09-11 14:03:38 +02:00
Koushik Das
65eeeaf071 CS-14277
Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
    Following changes are made:
    - Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
    - Create/delete of data volume on local storage
    - Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
    - Migration of VM instance is not supported if it uses local root or data volumes.
    - Migrate is not supported for local volumes.
    - Zone level config to enable/disable local storage usage for service and disk offerings.
    - Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
    - Deploy VM command validates service and disk offerings based on local storage config.
    - Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010)
2012-09-11 17:22:43 +05:30
Wido den Hollander
e7ff6ecd77 debian: Depend on jsch from the repository
This way we don't need to distribute the JAR in cloud-deps
2012-09-11 13:31:50 +02:00
Wido den Hollander
a84ec1218d debian: Install cglib through the package manager
cglib 2.2.2 is available in Ubuntu and Debian from the repositories, no need
to ship it in the cloud-deps package.

It's also not used by cloud-agent, but by cloud-utils, so place the dependency there.
2012-09-11 13:24:26 +02:00
Radhika Puthiyetath
4a8bb9dfc7 Feature Documentation for s2svpn interVlan and Autoscale 2012-09-11 14:23:59 +05:30
Mice Xia
87ecde648f CLOUDSTACK-72 Error label in traffic type edit dialog in zoneWizard 2012-09-11 14:06:00 +08:00
Prasanna Santhanam
c4f91b2914 Write results to stdout when result log is not specified 2012-09-11 11:06:23 +05:30
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
Edison.Su
52d8849003 fix rpm build 2012-09-10 22:33:41 -04:00
Fang Wang
4b8fb79ef6 Fix the output of instance-id and vm-id to UUID 2012-09-10 18:02:34 -07:00
Fang Wang
663e250334 Replace db-id by UUID for user VM's vm-id. 2012-09-10 18:01:08 -07:00
Alex Huang
9095f0b268 Fixed build for windows 2012-09-10 17:21:34 -07:00
Edison.Su
1aa7a50cf2 fix rpm build 2012-09-10 19:51:16 -04:00
Alena Prokharchyk
d6b6529951 Revert "CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails"
This reverts commit ecd1ac214c34007214557c4191a803a55ded29f5.
2012-09-10 16:34:21 -07:00
Edison Su
176c340492 fix the build, hope 2012-09-10 16:29:38 -07:00
Edison.Su
022af906c0 it breaks the build 2012-09-10 17:44:52 -04:00
Edison.Su
54fd39b9c0 add build-helper to remove the local repo 2012-09-10 17:09:38 -04:00
Anthony Xu
0442917381 only check ISO which is downloaded status 2012-09-10 13:30:25 -07:00
Edison.Su
c14dcd2da2 CLOUDSTACK-63: remove ant 2012-09-10 16:19:10 -04: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
fae3ce3ebd Fixed rampart group ID in the awsapi/pom.xml file. 2012-09-10 16:00:44 -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
David Nalley
e6f82b164b fixing a few license headers 2012-09-10 13:29:08 -04:00
Mice Xia
55980c5338 remove mysql-connector-java.jar from rpm package 2012-09-10 23:37:29 +08:00
Mice Xia
6318e88c7d part of CLOUDSTACK-69 remove hibernate and its dependency from wscript_build and cloud.spec 2012-09-10 23:33:11 +08:00
Wido den Hollander
a6a74c7d9c debian: Depend on log4j 1.2.16 and add to CLASSPATH
Ubuntu 12.04 and Debian (testing) both ship from their repository, so there is no need
for us to distribute it in our packages.

We depend on it externally for our logging.
2012-09-10 16:42:07 +02:00
Wido den Hollander
18cad09dff waf: Small whitespace cleanup 2012-09-10 16:42:07 +02:00
Wido den Hollander
6f03c327f5 debian: Make maven a build dependency
We require at least Maven 3.0.4 for building the Debian packages.

This is available in Debian Testing and Ubuntu 12.04
2012-09-10 16:42:07 +02:00
Chip Childers
fc8fc2a5c6 Added gitignore for deps/*.jar so that the files are not added
back into the source tree.
2012-09-10 10:38:42 -04:00
Chip Childers
cbd4cb3fb9 CLOUDSTACK-26 and CLOUDSTACK-47: Removing *.war, *.jar, and deps/awsapi-lib/rampart-lib/*.txt files.
I realize that this might be destructive to the stability of the
tree, but these files have to be removed.

I tested the build, and it appears to still function without any of these
binary files being in the source tree.
2012-09-10 10:26:26 -04:00
Mice Xia
0d02e33d31 CLOUDSTACK-69 Hibernate jars should be removed 2012-09-10 21:15:35 +08:00