On Fri, May 03, 2013 at 07:45:13AM -0700, Sheng Yang wrote: > I suppose so. BTW, you would need: > > commit 8832a529fc8fec96f00e201b80fe1f09b587da15 > Author: Sheng Yang <[email protected]> > Date: Thu May 2 22:12:31 2013 -0700 > > Fix rat > > exclude dnsmasq.conf.tmpl > > As well.
thanks - applied both > > > On Fri, May 3, 2013 at 6:54 AM, Chip Childers > <[email protected]>wrote: > > > On Thu, May 02, 2013 at 08:21:49PM -0700, Sheng Yang wrote: > > > https://issues.apache.org/jira/browse/CLOUDSTACK-2044 > > > > > > The bug existed in 4.1 as well. I've already committed a fix for MASTER. > > > > > > The fix is simple. But considering the current timing(we're about to > > > release), and the way of reproducing is a little complex, I may want to > > > leave the fix in 4.2 and 4.1.1(after 4.1 release). > > > > > > What's your thought? > > > > > > --Sheng > > > > Can I do a clean cherry-pick of the master branch commit? Seems small > > enough, plus we're still struggling with outstanding upgrade bugs! > > > > -chip > >
