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
Chip Childers
763311c006
License header updates, and modification to root pom for exclusions.
2012-09-13 16:55:48 -04:00
Jie Feng
c9aa08350a
[DOC] docbook conversion - choosing a deployment architecture
2012-09-13 16:12:06 -04:00
Mice Xia
5532f58bbc
remove cloud.com license headers
2012-09-13 12:34:32 +08:00
Sheng Yang
fe8a2992a2
Elimiate mystery guestIp in IpAddressTO
...
Nobody can explain why it's there...
Also fix wrong return result of several empty network element callbacks
2012-09-12 15:42:48 -07:00
Chip Childers
2ba09d88c8
Patch from Gavin Lee: Change license to ASL2.0 in plugin
2012-08-30 09:17:11 -04:00
olivier lamy
fe8a01106b
rename cloud-plugins to cloudstack-plugins
2012-08-27 16:53:51 +02:00
olivier lamy
c68dd35b6e
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-08-27 16:44:18 +02:00
olivier lamy
a06ed5728c
remove intermediate parent poms
2012-08-27 16:43:24 +02:00
Hugo Trippaers
e2b814d045
If there already is an entry in the nic mapping table for a starting VM,
...
try to reconcile with the Nicira Controller.
2012-08-27 13:41:27 +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
490e87a617
Fix small compilation issue encountered when building with maven
2012-08-24 11:18:53 -07:00
Darren Shepherd
f826971fea
Maven config, initial commit
2012-08-24 11:18:52 -07:00
Edison Su
481aae1ebc
add recreate.systemvm.enabled parameter to control recreating systemvm
2012-08-20 11:19:26 -07:00
tomoe@midokura.jp
ce12d0d70d
Submit Midokura SDN controller stubs
2012-08-13 18:55:11 +05:30
Alena Prokharchyk
048c5e50cf
Merge branch 'master' into vpc
...
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
Sheng Yang
46a12b378c
CS-15243: Add service combination check at create network offering
2012-08-07 13:17:48 -07:00
Alena Prokharchyk
95449da4be
Merge branch 'master' into vpc
2012-08-07 11:37:45 -07:00
Chip Childers
81ff7a09fd
CS-15875 resolved via patch from Andy Gross.
2012-08-07 14:10:11 -04:00
Hugo Trippaers
dd6fd2b68d
Remove XTrustProvider as this class is kept within the
...
cloud-iControl.jar.
2012-08-06 16:31:36 +02:00
Alena Prokharchyk
5a72044dc7
Merge branch 'master' into vpc
2012-08-03 14:30:54 -07:00
Alena Prokharchyk
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
Chip Childers
3a882fa17c
License header updates for the plugins folder.
2012-08-03 09:07:43 -04:00
Alena Prokharchyk
ce9f1afa78
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-08-01 19:04:28 -07:00
Hugo Trippaers
65daade79a
Add a "ping" function to the resource and allow commands to be retried.
2012-08-01 14:11:32 +02:00
Alena Prokharchyk
7706a9c32f
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-31 13:37:28 -07:00
Hugo Trippaers
b4bcd7f3fe
Use the name of the network (or uuid) as display text of the nicira logical switch.
2012-07-30 15:17:46 +02:00
Hugo Trippaers
236f63fd34
When cleaning up or setting ip associations the NiciraNvpElement should be ignored.
...
Implemented a generic ConnectivyProvider interface work around the dependency from server to nicira-plugin.
2012-07-30 15:17:35 +02:00
kishan
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
Alena Prokharchyk
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
kishan
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
Alena Prokharchyk
6420ecbd6f
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-24 16:13:06 -07:00
David Nalley
4421cd9dee
fixing a few more license headers
2012-07-24 10:47:03 -04:00
bfederle
c8f72c9198
Merge branch 'master' into vpc
...
Conflicts:
ui/scripts/network.js
2012-07-23 10:36:25 -07:00
David Nalley
67bc9c819a
fixing some more license headers
2012-07-20 15:59:31 -04:00
Alena Prokharchyk
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
Hugo Trippaers
79c7da07ab
Phase 1 of Nicira integration
2012-07-11 17:16:06 -07:00
Edison Su
8b7b838c8a
CS-15544: recreate router if router filesystem is crashed
2012-07-11 16:14:28 -07:00
Alena Prokharchyk
31f9d718fb
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
Alena Prokharchyk
40a3482f13
VPC: multiple fixes:
...
* Separate service for NetworkACL - "NetworkACL" service
* allow having just one network supporting LB in the VPC
* perform check against VPC when upgrade network to the new network offering (the same set of checks when you add new network to the VPC)
2012-07-02 17:44:54 -07:00
Murali reddy
9876d34ea4
moving out ELB network element to plugins/network-elements/elastic-loadbalancer
2012-07-02 15:05:58 -07:00
Alena Prokharchyk
1f01d923ca
Merge branch 'master' into vpc
2012-06-28 17:44:08 -07:00
Alena Prokharchyk
634cd78baa
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
api/src/com/cloud/api/commands/ListNetworksCmd.java
api/src/com/cloud/api/response/NetworkResponse.java
api/src/com/cloud/event/EventTypes.java
api/src/com/cloud/network/NetworkService.java
client/tomcatconf/commands.properties.in
scripts/network/domr/getDomRVersion.sh
scripts/network/domr/ipassoc.sh
scripts/network/domr/l2tp_vpn.sh
scripts/network/domr/networkUsage.sh
scripts/network/domr/router_proxy.sh
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/IPAddressDao.java
server/src/com/cloud/network/dao/IPAddressDaoImpl.java
setup/apidoc/gen_toc.py
setup/db/create-schema.sql
wscript
2012-06-28 17:41:40 -07:00
Murali reddy
c41094154d
moving out OVS code to plugins/network-elements/ovs
2012-06-28 17:23:41 -07:00
Murali reddy
392ae5cb13
moving out Srx code into Plugins/network-elements
2012-06-25 16:55:53 -07:00
Murali reddy
422c4ce513
moving out F5 code from server into plugins/network-elements/f5/
2012-06-23 14:16:59 -07:00
Murali reddy
49b88472a5
moving out NetScaler network element code from CloudStack core into plugins/network-elements/netscaler
2012-06-21 18:57:18 -07:00
