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 |
Mice Xia
|
0d02e33d31
|
CLOUDSTACK-69 Hibernate jars should be removed
|
2012-09-10 21:15:35 +08:00 |
Darren Shepherd
|
43e4de429e
|
Fix up some dependencies
|
2012-08-28 09:03:25 -07:00 |
|
Darren Shepherd
|
590f52df82
|
Include some missing resources in the jars
|
2012-08-28 08:59:20 -07:00 |
olivier lamy
|
40f9d84ea9
|
versions defined in parent pom
|
2012-08-27 21:54:27 +02:00 |
|
olivier lamy
|
a06ed5728c
|
remove intermediate parent poms
|
2012-08-27 16:43:24 +02:00 |
|
olivier lamy
|
3aa469da2a
|
groupdId is now org.apache.cloudstack
|
2012-08-25 09:20:21 +02:00 |
|
olivier lamy
|
5ef60aceb1
|
%s/tab/ws/
|
2012-08-25 00:03:23 +02:00 |
Darren Shepherd
|
4a4007e652
|
Add license
|
2012-08-24 11:18:54 -07:00 |
|
Darren Shepherd
|
ebc0fa458a
|
* Maven 3 support
* Pretty Format POM's
* AWS API compiles now
|
2012-08-24 11:18:54 -07:00 |
Darren Shepherd
|
f826971fea
|
Maven config, initial commit
|
2012-08-24 11:18:52 -07:00 |