Sheng Yang 5cb9df91a1 Merge branch 'ipv6' ...

Conflicts:
	api/src/com/cloud/network/NetworkProfile.java

2013-01-31 15:07:33 -08:00

..

baremetal

Merge branch 'ipv6'

2013-01-31 15:07:33 -08:00

kvm

Summary: Account for embedded nics (e.g. 'em0') when looking for physical nic

2013-01-28 21:20:03 -08:00

ovm

Start removing the old ant build files

2012-12-07 15:58:56 +01:00

simulator

Clean up ApiServer, ApiServlet and ApiDispatcher flow to handle various CloudRuntimeException

2013-01-16 22:36:34 -08:00

vmware

Merge branch 'ipv6'

2013-01-31 15:07:33 -08:00

xen

Merge branch 'ipv6'

2013-01-31 15:07:33 -08:00