Alena Prokharchyk 1cff609347 Merge branch 'master' into internallb1 ... Conflicts: server/src/com/cloud/network/NetworkModelImpl.java server/src/com/cloud/network/NetworkServiceImpl.java server/src/com/cloud/server/ManagementServerImpl.java server/test/com/cloud/network/MockNetworkManagerImpl.java server/test/com/cloud/vpc/MockNetworkManagerImpl.java		2013-05-03 12:50:59 -07:00
..
WEB-INF	VM wizard: Show message if no affinity groups are available.	2013-04-30 13:30:40 -07:00
bindir	Summary: update packaging	2013-02-05 10:47:42 +01:00
distro	init: Explicitly set the HOME variable to the homedir of the user cloud	2013-01-09 13:11:21 +01:00
tomcatconf	Merge branch 'master' into internallb1	2013-05-03 12:50:59 -07:00
pom.xml	Merge branch 'master' into internallb1	2013-04-29 16:12:10 -07:00