cloudstack/plugins/api/discovery/src/org/apache/cloudstack
frank 1f15c1e9e7 CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

fixing bugs to align to new code base

Conflicts:

	client/tomcatconf/componentContext.xml.in
2013-02-21 15:42:38 -08:00
..
api Merge branch 'master' into javelin 2013-01-24 19:18:53 -08:00
discovery CloudStack CLOUDSTACK-774 2013-02-21 15:42:38 -08:00