c4c9d2d879
Summary: Fixes for api_refactoring
...
Detail: api_refactoring branch was recently merged into master. This pulls in
those changes and fixes conflicts. Tested to ensure functionality was intact.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1357778902 -0700
2013-01-09 17:48:22 -07:00
177e157cbf
CLOUDSTACK-306: Move inline mode parameter from device to network offering
...
One F5 device can be used as inline and side-by-side at the same time(for
different networks). So we can define inline or not on network base.
2013-01-04 19:17:58 -08:00
2b74b6e827
Start removing the old ant build files
...
Removed all build.xml files from the plugins
2012-12-07 15:58:56 +01:00
bf1e6ed991
CS-15644-Autoscale: Implemented UUIDs for templateId-serviceOff Reviewed-By:Vijay
2012-11-16 10:56:58 +05:30
dda4d39b55
AutoScale changes in Apache master
2012-11-16 10:56:44 +05:30
214bbf3ebd
CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup
...
Conflicts:
api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java
server/src/com/cloud/network/element/CiscoNexusVSMElement.java
server/src/com/cloud/network/element/ElasticLoadBalancerElement.java
server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
server/src/com/cloud/network/element/NetscalerElement.java
server/src/com/cloud/network/element/OvsElement.java
server/src/com/cloud/network/element/VpcJuniperSRXExternalFirewallElement.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
server/src/com/cloud/storage/StorageManager.java
2012-10-17 17:26:19 -07:00
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
c9aa08350a
[DOC] docbook conversion - choosing a deployment architecture
2012-09-13 16:12:06 -04:00
fe8a01106b
rename cloud-plugins to cloudstack-plugins
2012-08-27 16:53:51 +02:00
a06ed5728c
remove intermediate parent poms
2012-08-27 16:43:24 +02:00
3aa469da2a
groupdId is now org.apache.cloudstack
2012-08-25 09:20:21 +02:00
5ef60aceb1
%s/tab/ws/
2012-08-25 00:03:23 +02:00
4a4007e652
Add license
2012-08-24 11:18:54 -07:00
ebc0fa458a
* Maven 3 support
...
* Pretty Format POM's
* AWS API compiles now
2012-08-24 11:18:54 -07:00
f826971fea
Maven config, initial commit
2012-08-24 11:18:52 -07:00
481aae1ebc
add recreate.systemvm.enabled parameter to control recreating systemvm
2012-08-20 11:19:26 -07:00
048c5e50cf
Merge branch 'master' into vpc
...
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
46a12b378c
CS-15243: Add service combination check at create network offering
2012-08-07 13:17:48 -07:00
5a72044dc7
Merge branch 'master' into vpc
2012-08-03 14:30:54 -07:00
e7a1862867
VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/ha/UserVmDomRInvestigator.java
2012-08-03 14:23:45 -07:00
3a882fa17c
License header updates for the plugins folder.
2012-08-03 09:07:43 -04:00
9611a017e9
bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
2012-07-27 23:37:46 -04:00
a39fd61249
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineGuru.java
2012-07-27 13:47:46 -07:00
468f2720eb
bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
2012-07-27 23:13:18 +05:30
a1acfd3bfa
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/network/Network.java
client/tomcatconf/components.xml.in
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/guru/GuestNetworkGuru.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
setup/db/create-schema.sql
2012-07-13 13:52:58 -07:00
8b7b838c8a
CS-15544: recreate router if router filesystem is crashed
2012-07-11 16:14:28 -07:00
31f9d718fb
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
9876d34ea4
moving out ELB network element to plugins/network-elements/elastic-loadbalancer
2012-07-02 15:05:58 -07:00
Marcus Sorensen
Sheng Yang
Hugo Trippaers
Deepak Garg
Vijay
Alena Prokharchyk
Hugo Trippaers
Jie Feng
olivier lamy
Darren Shepherd
Darren Shepherd
Edison Su
Chip Childers
kishan
Murali reddy