> On Aug. 6, 2012, 5:46 p.m., edison su wrote: > > When developers checking bugfixes in 3.0.x or other branch, they should > > push the fixes into apache master also. But there are some fixes not > > following this pattern(like the patch you send), we need to manually > > cherry-pick them into master. There is another one need to be > > cherry-picked(08bd7c31b47a9fecae00b2bbf73a54432341044e).
I'm not much aware of previous bugfixes, this bugfix consumed half my day to find that it was previously fixed in 3.0.x. So, all the developers please do what Edison suggests. @Edison: The commit blob (08bd7c31b47a9fecae00b2bbf73a54432341044e) you suggest does not exist in asf, is it on some different repo? - Rohit ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/6392/#review9889 ----------------------------------------------------------- On Aug. 6, 2012, 12:40 p.m., Rohit Yadav wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/6392/ > ----------------------------------------------------------- > > (Updated Aug. 6, 2012, 12:40 p.m.) > > > Review request for cloudstack, Nitin Mehta and edison su. > > > Description > ------- > > Cherry-picked from 3.0.x, fixes template upload/register checksum issue in > master. > > Question: There are many bugfixes in 3.0.x and possibly other branches, > how/when they will be merged in master. > I think most use master branch, how should bugfixes be merged from other > branches to master? May be the relatively stable branch should have a suffix > stable, like 3.0.x-stable or 3.0.x-maintanence. For example the NVIE model: > http://nvie.com/posts/a-successful-git-branching-model/? Comment, thanks. > > Download original patch: http://patchbin.baagi.org/p?id=d1jp2e > > > Diffs > ----- > > core/src/com/cloud/storage/template/DownloadManagerImpl.java cd4b30d > > Diff: https://reviews.apache.org/r/6392/diff/ > > > Testing > ------- > > > Thanks, > > Rohit Yadav > >
