alena 0d2787e2db bug 4706: allow to specify which ip address from the network to take when do vm deployment. The model is supported for multiple network case as well. ...

status 4706: resolved fixed

Merge from master to 2.2.8 branch

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/network/NetworkManager.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/vm/UserVmManagerImpl.java

2011-07-15 14:20:52 -07:00

..

conf

Removed bad word from log4j config files.

2011-02-08 13:55:40 -08:00

scripts

Source code committed

2010-08-11 09:13:29 -07:00

src/com/cloud

bug 4706: allow to specify which ip address from the network to take when do vm deployment. The model is supported for multiple network case as well.

2011-07-15 14:20:52 -07:00

test

bug 9651: missing changes

2011-06-14 11:11:24 -07:00

.classpath

classpath fix for server

2011-02-17 12:14:23 -08:00

.project

Fix corrupted eclipse project settings, schema fixes and updated template download url

2010-09-29 18:41:54 -07:00