Hi, Due to absent of Frank, I've tried to make sure Baremetal wouldn't miss 4.2. So for the last a few days work, I am able to re-enable baremetal for master.
It turn out the change is not big, and most of it just compose of revert of previous change, and I fixed some issues brought by the new features. The total change summary is: -- client/pom.xml | 5 +++++ client/tomcatconf/applicationContext.xml.in | 4 ---- client/tomcatconf/componentContext.xml.in | 10 ---------- client/tomcatconf/nonossComponentContext.xml.in | 8 -------- plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java | 3 ++- plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java | 6 ------ plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java | 6 ++++-- plugins/network-elements/dns-notifier/resources/components-example.xml | 8 -------- server/src/com/cloud/network/NetworkServiceImpl.java | 9 +++------ 9 files changed, 14 insertions(+), 45 deletions(-) I've tested against the original blocker issues: https://issues.apache.org/jira/browse/CLOUDSTACK-1610 https://issues.apache.org/jira/browse/CLOUDSTACK-1618 https://issues.apache.org/jira/browse/CLOUDSTACK-1614 https://issues.apache.org/jira/browse/CLOUDSTACK-1440 They all passed. Can I say we're ready to re-enable the baremetal in master now? --Sheng