Frank Zhang 1b0a0d68f1 CLOUDSTACK-7795 ... Fix multiple baremetal rct configuraitons Conflicts: api/src/com/cloud/event/EventTypes.java plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java		2014-10-27 16:11:26 -07:00
..
resources/META-INF/cloudstack	Removed "host" config parameter definition from ClusterManager interface as it got moved to cloud-api package	2014-01-21 17:19:52 -08:00
src	CLOUDSTACK-7795	2014-10-27 16:11:26 -07:00
test	Merge branch 'master' into marvin	2014-04-08 17:53:37 +05:30
pom.xml	api: fix refactored ApiServerService interface to api	2014-08-28 19:45:22 +02:00