cloudstack/engine/schema/src
frank b37e6c14c1 CloudStack CLOUDSTACK-1365
UI support for baremetal PXE server

CloudStack CLOUDSTACK-1364
UI support for baremetal DHCP server

Conflicts:

	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
2013-08-22 16:35:23 -07:00
..
com/cloud CloudStack CLOUDSTACK-1365 2013-08-22 16:35:23 -07:00
org/apache/cloudstack CLOUDSTACK-3950:Set cross-zone flag in registerTemplate/registerIso in 2013-08-20 14:13:49 -07:00