cloudstack/server/src/com/cloud
Prachi Damle a08ae8e42c [ASFCS40]CS-15586: Public Vlan for an account fails in case of multiple Physical networks
Changes:
- Since Now a zone can have multiple physical networks, we need to find the physical network Id from the networkOffering's tag and zoneId and trafficType when we create a guest network

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2012-08-23 18:18:12 -07:00
..
account Patch from Chip Childers 2012-07-02 09:51:21 -04:00
acl Patch from Chip Childers 2012-07-02 09:51:21 -04:00
agent Remove @author tag from non third-party source files in server folder 2012-08-13 15:17:31 +08:00
alert Patch from Chip Childers 2012-07-02 09:51:21 -04:00
api PublicIpAddress api response: new parameter "associatednetworkname" - the name of the guest network associated with the ip address 2012-08-21 15:35:40 -07:00
async Patch from Chip Childers 2012-07-02 09:51:21 -04:00
baremetal Move KVM related code into plugins/hypervisor/kvm, a new jar file is 2012-07-30 14:55:47 -07:00
capacity bug CS-15278: For removing clusters crossing threshold find out the list of cluster through db instead of iteratting cluster one by one in the java code. 2012-08-13 16:20:57 +05:30
certificate/dao Patch from Chip Childers 2012-07-02 09:51:21 -04:00
cluster fix from Pradeep Soundararajan for removing build dependency on mysql-connector-java https://reviews.apache.org/r/6180 2012-08-20 13:38:19 -04:00
configuration CS-15304: VR deployment - release the lock for the network once the router entry is allocated (2.2.x behavior) as opposed to releasing it when the router start is completed 2012-08-21 15:31:07 -07:00
consoleproxy add recreate.systemvm.enabled parameter to control recreating systemvm 2012-08-20 11:19:26 -07:00
dao Patch from Chip Childers 2012-07-02 09:51:21 -04:00
dc Merge branch 'master' into vpc 2012-07-06 12:04:10 -07:00
deploy bug CS-15278: For removing clusters crossing threshold find out the list of cluster through db instead of iteratting cluster one by one in the java code. 2012-08-13 16:20:57 +05:30
domain Patch from Chip Childers 2012-07-02 09:51:21 -04:00
event Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ha HA worker thread needs to have its own worker thread configuration 2012-08-17 12:59:52 -07:00
host/dao Phase 1 of Nicira integration 2012-07-11 17:16:06 -07:00
hypervisor Merge branch 'master' into vpc 2012-08-01 19:04:28 -07:00
keystore Patch from Chip Childers 2012-07-02 09:51:21 -04:00
maint Patch from Chip Childers 2012-07-02 09:51:21 -04:00
migration Patch from Chip Childers 2012-07-02 09:51:21 -04:00
network [ASFCS40]CS-15586: Public Vlan for an account fails in case of multiple Physical networks 2012-08-23 18:18:12 -07:00
offerings Merge branch 'master' into vpc 2012-07-03 17:32:50 -07:00
projects ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute 2012-08-01 18:54:08 -07:00
resource Patch fixes file names and imports wherever used, in files introduced in 2012-07-31 10:38:11 -07:00
resourcelimit Name change for vpc/Dao package (dao is lowercased now) 2012-08-08 14:51:51 -07:00
secstorage Patch from Chip Childers 2012-07-02 09:51:21 -04:00
server bug CS-15278: Download Volume fails in case of Multiple Secondary Storages. Correcting it to use the same secondary storage to copy the volume and creating the soft link 2012-08-16 15:53:00 +05:30
service Patch from Chip Childers 2012-07-02 09:51:21 -04:00
servlet apply patch https://reviews.apache.org/r/6572/ 2012-08-13 17:28:41 -07:00
storage CS-16089: Create Template after upgrade from snapshot taken in 2.2.14 was failing since the swift_id was not null but 0 instead. Put a check in the code to check for not null and not 0 swift_id to go and download the snapshot from the swift. 2012-08-21 13:46:18 +05:30
tags Name change for vpc/Dao package (dao is lowercased now) 2012-08-08 14:51:51 -07:00
template Patch from Chip Childers 2012-07-02 09:51:21 -04:00
test CS-16030: set UUID when persist public ip address 2012-08-16 10:13:39 -07:00
upgrade [ASFCS40]Upgrade to 4.0: host_details unique key addition needs IGNORE keyword to correct the duplicates 2012-08-23 17:52:04 -07:00
usage Patch from Chip Childers 2012-07-02 09:51:21 -04:00
user Remove @author tag from non third-party source files in server folder 2012-08-13 15:17:31 +08:00
uuididentity ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute 2012-08-01 18:54:08 -07:00
vm [ASFCS40]CS-15586: Public Vlan for an account fails in case of multiple Physical networks 2012-08-23 18:18:12 -07:00