Alena Prokharchyk 110903a91a VPC: added vif info to ipassoc command ...

Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java

2012-07-27 13:53:41 -07:00

..

conf

fixing line endings in server

2012-04-07 20:13:10 -04:00

scripts

…

src/com/cloud

VPC: added vif info to ipassoc command

2012-07-27 13:53:41 -07:00

test

VPC: added vif info to ipassoc command

2012-07-27 13:53:41 -07:00

.classpath

bug 6745: Using UUID instead of integers - for System VM s

2011-11-03 07:33:57 -07:00

.project

…