Rohit Yadav 37820e15f2 CLOUDSTACK-7593: allow nic type to be fetched from vm's details ... (cherry picked from commit 43db75c319) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> Conflicts: engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java		2015-04-13 15:47:03 +05:30
..
resources/META-INF/cloudstack	Add missing licenses	2013-10-23 15:20:08 -07:00
src	CLOUDSTACK-7593: allow nic type to be fetched from vm's details	2015-04-13 15:47:03 +05:30
test	CLOUDSTACK-5236 : ability to identify where the user is from (ex. LDAP)	2015-03-16 14:53:53 +05:30
pom.xml	Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT	2014-10-29 14:54:23 +01:00