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

60 Commits

Author SHA1 Message Date
Chip Childers 2e2dd684d2 Updating pom.xml version numbers for release 4.1.2-SNAPSHOT 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-07-31 11:06:29 -04:00
ilya musayev cf2babe7a7 Revert "Updating pom.xml version numbers for release 4.1.1" 
This reverts commit d2c646f0a4.
 2013-07-25 13:55:33 -04:00
ilya musayev d2c646f0a4 Updating pom.xml version numbers for release 4.1.1 
Signed-off-by: ilya musayev <ilya@apache.org>
 2013-07-25 13:52:58 -04:00
ilya musayev 8794bb6346 Revert "Updating pom.xml version numbers for release 4.1.1" 
This reverts commit 8fe3505cba.
 2013-07-24 13:13:09 -04:00
ilya musayev 8fe3505cba Updating pom.xml version numbers for release 4.1.1 
Signed-off-by: ilya musayev <ilya@apache.org>
 2013-07-24 13:11:48 -04:00
Chip Childers 707f95dfa0 Updating pom.xml version numbers for release 4.1.1-SNAPSHOT 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-06-15 13:14:40 -04:00
Chip Childers 780439e3bb Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit a5214bee99.
 2013-05-28 09:22:01 -04:00
Chip Childers a5214bee99 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-05-28 09:16:12 -04:00
Chip Childers aa29234ee0 Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit d0da9f7f46.
 2013-05-28 09:09:22 -04:00
Chip Childers d0da9f7f46 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-05-28 09:03:41 -04:00
Chip Childers 8a99d19b34 Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit db007da152.
 2013-05-26 10:36:16 -04:00
Chip Childers db007da152 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-05-26 10:32:45 -04:00
Chip Childers 2229727236 Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit 873c1972c7.
 2013-05-24 12:37:59 -04:00
Chip Childers 873c1972c7 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-05-24 12:31:24 -04:00
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
Likitha Shetty ed06c16944 CLOUDSTACK-863: Fix Non-printable characters in api call 
Non-printable characters results in empty pages for all users loading the
corrupted object in the web interface. It also results in the API call results
getting truncated with an error when it encounters the non-printable characters.
Every decoded parameter value is checked for control character using OWASP's
ESAPI library.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 87b668b71b)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-16 11:56:50 +05:30
Kelven Yang 7bd8bec68a Sync javelin with master up to 894cb8f7d9 2013-01-31 17:20:19 -08:00
Sheng Yang bd4bc025d1 IPv6: Accept IPv6 parameter for createNetworkCmd 
Also ass public_ipv6_address for ipv6 address management.

Extend nics and vlans for ipv6 address.

Add dependency to com.googlecode.ipv6(java-ipv6).

Modify dhcpcommand for ipv6.
 2013-01-26 23:14:15 -08:00
Alex Huang 9759ad57f2 Commit the current changes to unit tests 2013-01-17 06:50:11 -08:00
Alex Huang b6c56736e5 merge from master 2013-01-09 05:20:36 -08:00
Rohit Yadav db297a338f utils: Reflection utilities to get cmd, annotation and fields 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-08 18:54:29 -08:00
Alex Huang cf8de7ee17 Removed all the .project files 2013-01-08 14:11:00 -08:00
Rohit Yadav 0659c21f2d Get latest changes, Merge branch 'master' into api_refactoring 2013-01-04 17:22:57 -08:00
Noa Resare 0055d80211 CLOUDSTACK-771: maven: add mysql version reference to enable non-snapshot builds 
If you update your build to build a version with a name not ending in -SNAPSHOT,
you are required to declare versions on all your depdendencies. There is already
a cs.mysql.version property, this patch makes sure it is used where appropriate.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2013-01-04 12:20:06 -05:00
Rohit Yadav 296b49c2f8 Merge branch 'master' into test-merge-api 
Conflicts:
	api/src/com/cloud/agent/api/BackupSnapshotCommand.java
	api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/resource/ResourceService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/storage/SnapshotVO.java
	pom.xml
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-23 13:54:46 -08:00
Rohit Yadav 5572707ec6 maven: Bump httpcore version, add guava and httpclient dependency 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-17 20:44:48 -08:00
Edison Su b70c1a5a84 Backs NFS-based secondary storage with an S3-compatible object store. Periodically, a reaper thread synchronizes templates and ISOs stored on a NFS secondary storage mount with a configured S3 object store. It also pushes snapshots to the object store when they are created and downloads them in other zones on-demand. In addition to permitting the use of commodity or IaaS storage solutions for static assets, it provides a means of automatically synchronizing template and ISO assets across multiple zones. 2012-12-13 23:18:37 -08:00
adefanti 2a0d0104bd maven : declare mysql-connector-java dependency into dependencyManagement section of cloudstack pom and use the version 5.1.21 only 
Signed-off-by: Hugo Trippaers <trippie@gmail.com>
 2012-11-20 09:27:07 +01:00
Hugo Trippaers f65b268a2e Active the testrun by default in maven 
Exclude the tests that need a database, these should move to the
integration test phase or use an in memory database maybe.
 2012-10-30 14:15:07 +01:00
Hugo Trippaers f16b5103d8 Merge some stuff from maven-waf branch into master 2012-10-01 15:04:08 -07:00
Hugo Trippaers aa6355ffe6 Updated master to 4.1.0 
mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P
client,deps,developer  -DdevelopmentVersion=4.1.0-SNAPSHOT
 2012-10-01 11:00:55 -07:00