Not required actually. Since Min's merge is for 4.2 and was made on master.
On Tue, Mar 05, 2013 at 11:29:13AM -0500, Chip Childers wrote: > Should this be fixed in 4.1 as well? > > On Tue, Mar 05, 2013 at 08:22:39AM +0000, t...@apache.org wrote: > > Updated Branches: > > refs/heads/master 88355b945 -> b683c34d3 > > > > > > Fix the typo in componentContext.xml.in > > > > HypervisorTemplateAdapter was mispelt causing server to not startup. > > > > Reported-by: Dave Cahill <dcah...@midokura.net.jp> > > Signed-off-by: Prasanna Santhanam <t...@apache.org> > > > > > > Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo > > Commit: > > http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b683c34d > > Tree: > > http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b683c34d > > Diff: > > http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b683c34d > > > > Branch: refs/heads/master > > Commit: b683c34d3f5fa47eecddd6bf6e90559ac04af9ba > > Parents: 88355b9 > > Author: Prasanna Santhanam <t...@apache.org> > > Authored: Tue Mar 5 13:51:06 2013 +0530 > > Committer: Prasanna Santhanam <t...@apache.org> > > Committed: Tue Mar 5 13:51:06 2013 +0530 > > > > ---------------------------------------------------------------------- > > client/tomcatconf/componentContext.xml.in | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > ---------------------------------------------------------------------- > > > > > > http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b683c34d/client/tomcatconf/componentContext.xml.in > > ---------------------------------------------------------------------- > > diff --git a/client/tomcatconf/componentContext.xml.in > > b/client/tomcatconf/componentContext.xml.in > > index 456484e..23566e2 100644 > > --- a/client/tomcatconf/componentContext.xml.in > > +++ b/client/tomcatconf/componentContext.xml.in > > @@ -140,7 +140,7 @@ > > <property name="name" value="Basic"/> > > </bean> > > > > - <bean id="hyervisorTemplateAdapter" > > class="com.cloud.template.HyervisorTemplateAdapter"> > > + <bean id="HypervisorTemplateAdapter" > > class="com.cloud.template.HypervisorTemplateAdapter"> > > <property name="name" value="HypervisorAdapter"/> > > </bean> > > > > > > -- Prasanna.,