etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,989 Commits 322 Branches 325 Tags 975 MiB
Commit Graph

16989 Commits

Author SHA1 Message Date
Alex Huang 622526a35e Fixed compliation 2012-09-11 17:44:46 -07:00
Alex Huang 87b3378cdc more changes 2012-09-11 17:38:32 -07:00
Alena Prokharchyk 2307117a24 Fixed unittest 2012-09-11 17:38:31 -07:00
Alena Prokharchyk 9445c9e73b 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:38:30 -07:00
Alena Prokharchyk 331598243c Replaced tabs with spaces in VirtualNetworkApplianceManagerImpl (tabs were used mostly in network stats related code) 2012-09-11 17:38:29 -07:00
Fang Wang 63ab0c2728 Keep the instance-id and vm-id values prior to Acton, use UUID for VMs created poast Acton. 2012-09-11 17:38:28 -07:00
Likitha Shetty 1c96ef41c1 CS-14796: Error out with InvalidParameterValueException in UserVmManagerImpl if userdata is not base64 encoded. 2012-09-11 17:38:27 -07:00
Prachi Damle a7d2a08c5e CLOUDSTACK-51: Outdated docs and license data present in awsapi 
CLOUDSTACK-53: CloudBridge installation pieces present, deprecated?
 2012-09-11 17:38:26 -07:00
Prachi Damle 335bb6f687 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 17:38:25 -07:00
Alena Prokharchyk 4a8ffe34e2 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 17:38:24 -07:00
Radhika Puthiyetath df7069d771 Feature Documentation for s2svpn interVlan Reviewed-By:Jessica Tomechak 2012-09-11 17:38:23 -07:00
Wido den Hollander 32c53b8941 debian: Remove *.conffiles files 
By default any file in /etc is a conffile according to dh_installdeb compat >= 3
 2012-09-11 17:38:22 -07:00
Wido den Hollander ef61b0e668 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:38:21 -07:00
Wido den Hollander b226273843 waf: Remove jnetpcap.jar from the common JAR files 
jnetpcap got removed some time ago with commit:e7995d09dce78434cce530b0428bcf69f00ff066
 2012-09-11 17:38:20 -07:00
Wido den Hollander 1dcec295eb debian: Add two JAR files to cloud-deps 
These are not available through the Ubuntu or Debian repositories
 2012-09-11 17:38:19 -07:00
Hiroaki Kawai 4798313427 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 17:38:18 -07:00
Wido den Hollander a0b638ba9d debian: Update locations where to search for Java under Ubuntu and Debian 2012-09-11 17:38:17 -07:00
Wido den Hollander b20df4f29b debian: Get backport-util-concurrent from the Debian repositories 2012-09-11 17:38:16 -07:00
Koushik Das 2404d3493d 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:38:15 -07:00
Wido den Hollander be003267cb debian: Depend on jsch from the repository 
This way we don't need to distribute the JAR in cloud-deps
 2012-09-11 17:38:14 -07:00
Wido den Hollander af59f01737 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 17:38:13 -07:00
Radhika Puthiyetath a28fd66b46 Feature Documentation for s2svpn interVlan and Autoscale 2012-09-11 17:38:12 -07:00
Mice Xia 4214a9b145 CLOUDSTACK-72 Error label in traffic type edit dialog in zoneWizard 2012-09-11 17:38:11 -07:00
Prasanna Santhanam 8facfb6b1d Write results to stdout when result log is not specified 2012-09-11 17:38:10 -07:00
Edison.Su 07b76bf8be CLOUDSTACK-64: remove junit 2012-09-11 17:38:09 -07:00
Edison.Su 126bd57bcf don't compile xenapi 2012-09-11 17:38:08 -07:00
Edison.Su 5437bfc607 fix rpm build 2012-09-11 17:38:07 -07:00
Fang Wang 452e34908f Fix the output of instance-id and vm-id to UUID 2012-09-11 17:38:06 -07:00
Fang Wang 88f85b29c2 Replace db-id by UUID for user VM's vm-id. 2012-09-11 17:38:05 -07:00
Alex Huang 9008a4a729 Fixed build for windows 2012-09-11 17:38:04 -07:00
Edison.Su 0955e23650 fix rpm build 2012-09-11 17:38:03 -07:00
Alena Prokharchyk b02551dcf6 Revert "CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails" 
This reverts commit ecd1ac214c.
 2012-09-11 17:38:02 -07:00
Edison Su 7ea8706046 fix the build, hope 2012-09-11 17:38:01 -07:00
Edison.Su 237b188c04 it breaks the build 2012-09-11 17:38:00 -07:00
Edison.Su 8ff6b0a6d9 add build-helper to remove the local repo 2012-09-11 17:37:59 -07:00
Anthony Xu efd0905fbd only check ISO which is downloaded status 2012-09-11 17:37:58 -07:00
Edison.Su e2e0ec6748 CLOUDSTACK-63: remove ant 2012-09-11 17:37:57 -07:00
Chip Childers f85f40e7b3 Changed the location from which to pull the mar files during deploy-server 2012-09-11 17:37:54 -07:00
Chip Childers 0503d9a703 Fixed rampart group ID in the awsapi/pom.xml file. 2012-09-11 17:37:54 -07:00
Chip Childers 516dd173fe Partial fix for awsapi deploy-server issues that I introduced when trying to fix CLOUDSTACK-26 2012-09-11 17:37:52 -07:00
David Nalley 5ca495d4c9 fixing a few license headers 2012-09-11 17:37:51 -07:00
Mice Xia bca8a99d96 remove mysql-connector-java.jar from rpm package 2012-09-11 17:37:50 -07:00
Mice Xia a69d6bc089 part of CLOUDSTACK-69 remove hibernate and its dependency from wscript_build and cloud.spec 2012-09-11 17:37:49 -07:00
Wido den Hollander 383cd8d983 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-11 17:37:48 -07:00
Wido den Hollander d09c81d018 waf: Small whitespace cleanup 2012-09-11 17:37:47 -07:00
Wido den Hollander ea46ece88d 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-11 17:37:46 -07:00
Chip Childers 08124537ab Added gitignore for deps/*.jar so that the files are not added 
back into the source tree.
 2012-09-11 17:37:45 -07:00
Chip Childers a9f69dadce 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-11 17:37:45 -07:00
Mice Xia c86711a5a9 CLOUDSTACK-69 Hibernate jars should be removed 2012-09-11 17:37:10 -07:00
Rohit Yadav 0330e64ba5 Maven: Fix POM in test 
Fixes and adds dependencies for building submodule test

Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
 2012-09-11 17:37:09 -07:00