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

90 Commits

Author SHA1 Message Date
Chip Childers 29be94f3ba Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit 9d8c8f2042.
 2013-04-26 15:14:00 -04:00
Chip Childers 9d8c8f2042 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-26 15:09:47 -04:00
Chip Childers 3be1754626 Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit ba7ba61671.
 2013-04-23 15:22:01 -04:00
Chip Childers ba7ba61671 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-23 15:18:19 -04:00
Chip Childers e3af51bfc5 Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit 88098e0c81.
 2013-04-23 14:58:55 -04:00
Chip Childers 88098e0c81 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-23 14:55:22 -04:00
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
Rohit Yadav 0364a4a34e maven: don't use process-test-resources lifecycles, target are skipped if test are 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 733ec50d46)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-12 12:18:54 +05:30
Chip Childers 86f5b424b5 CLOUDSTACK-1233: Fixed veewee config file legal documentation 
The veewee configuration files used for the devcloud base-box build, as
well as the newly introduced files used to create a system vm, were
inappropriately identified as ASLv2 licensed and copyrighted by the ASF.

The fixes:
- The ASF headers stripped to match the source.
- The files are now excluded from RAT checks in the root pom.
- The tools/whisker/descriptor.xml file updated
- The root LICENSE and NOTICE were re-generated

Changes in the Apache Whisker templates for LICENSE and NOTICE files
caused a good bit of whitespace oddness in this commit for those 2
files.

Signed-off-by: Chip Childers <chip.childers@gmail.com>

Conflicts:

	tools/appliance/definitions/systemvmtemplate/base.sh
	tools/appliance/definitions/systemvmtemplate/cleanup.sh
	tools/appliance/definitions/systemvmtemplate/zerodisk.sh
 2013-02-11 21:54:49 -05:00
Rohit Yadav 356866c72b Merge branch 'master' into javelin 
- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
	api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
	api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
	plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/swift/SwiftManagerImpl.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-24 19:18:53 -08:00
Rohit Yadav 7b11b71d81 maven: create dependency, deploydb on developer first and then on devcloud 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit afb2770012)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-22 16:32:57 -08:00
Rohit Yadav 1a695b84b4 tools: Fix devcloud artifact name, avoid confusion 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-22 16:32:51 -08:00
Rohit Yadav afb2770012 maven: create dependency, deploydb on developer first and then on devcloud 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-22 16:30:35 -08:00
Rohit Yadav a736f6b44f tools: Fix devcloud artifact name, avoid confusion 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-22 16:19:45 -08:00
Chip Childers 45d21c3202 Devcloud config for basic zone + management server. 
Added a devcloud config that supports having the management
server run within devcloud, using the basic zone setup.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2013-01-22 16:44:34 -05:00
Rohit Yadav 22e70f2c8e devcloud: Update a working p.a.o url in devcloud.sql 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-22 10:55:05 -08:00
Alex Huang 10d9c019a9 All merge conflicts resolved 2013-01-18 12:14:57 -08:00
Marcus Sorensen 354c56a988 Summary: Adding apache license headers to various devcloud configs 
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358284904 -0700
 2013-01-15 14:21:44 -07:00
Marcus Sorensen 0412cb8d92 Summary: Edit devcloud cfg files for advanced networking, add comments 2013-01-15 02:16:25 +00:00
Marcus Sorensen e97090a920 Summary: Updated devcloud-advanced.cfg and devcloud-kvm-advanced.cfg 
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358208922 -0700
 2013-01-14 17:15:22 -07:00
Marcus Sorensen 9139949d96 Summary: Adding devcloud-advanced.cfg marvin config for advanced network testing 
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358193432 -0700
 2013-01-14 12:57:12 -07:00
Alex Huang 30f2565d98 Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00
James Martin 7c56a81bdd devcloud: Fixed regression for network.conf commit 97fe053e2e 
Fixes regression for network.conf, commit:
commit 97fe053e2e
Author: Chip Childers <chip.childers@gmail.com>
Date: Mon Aug 13 11:12:01 2012 -0400

Removed ASF license header from network.conf, because XCP doesn't respect comment lines in this file

This seemed to have been re-introduced during the merge in of my patch.  This file has no been removed
completely and is created in-line through the puppet module.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-17 13:16:32 -08:00
James Martin 0661f9b814 Added fix to force apt to do a "apt-get update" before packages are installed. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-16 12:29:49 -08:00
Rohit Yadav be6acc719a rat: Apply missing license for devcloud puppet file 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 23:41:00 -08:00
Rohit Yadav 89dc874f6f rat: Fix license on recently added new files in tools/devcloud 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 22:23:09 -08:00
Rohit Yadav eddb3dfc92 devcloud: Move build scripts to src/, fix README and rm Gemfile.lock 
- Move build scripts to src/
- Fix README.md
- Remove and ignore Gemfile.lock
- Fix tabs in boxer.sh
- Move to src/

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:39 -08:00
James Martin e46aa61068 Removed starting of cloudstck from buildcloudstack 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:39 -08:00
James Martin 6d22df9256 Added script for starting cloudstack. Added python-mysql.connector package. renamed script to buildcloudstack. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:39 -08:00
James Martin 355df8affb made Vagrantfile headless again. puppet manifests now (mostly) pass puppet-lint tests. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:38 -08:00
James Martin 069b8507f3 Adding info. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:38 -08:00
James Martin 4367497000 Updated readme. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:38 -08:00
James Martin a990f7abe4 Successfully building devcloud now. Added option in params.pp for compiling cloudstack or not. moved ebtables stuff to devcloudinitial update build scripts in builddevcloud.sh.erb 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:38 -08:00
James Martin 7340433e51 Iptables file must be puppeted in the xenbox stage so it exists when the network is started in the devcloud phase. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:38 -08:00
James Martin 0555b79e8d Updated to suppor 2 nics. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:38 -08:00
James Martin 7902a69872 Change interfaces as per devcloud2 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:38 -08:00
James Martin f55c230d89 Updated readme, adding rvmrc. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 19:36:38 -08:00