Min, Edison, I did yesterday, after posting I had a look at the conflicts and deemed them resolvable. A quick look for verification won't hurt though.
regards, On Wed, Mar 19, 2014 at 1:03 AM, Min Chen <min.c...@citrix.com> wrote: > Edison, did you cherry-pick > https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=1b06451 > 5ac9c7f87e1780ab2210e60723f9d541c to 4.4 and master? It is in 4.3. > > Thanks > -min > > On 3/18/14 3:45 AM, "Daan Hoogland" <daan.hoogl...@gmail.com> wrote: > >>H Min, Edison, >> >>As discussed in a prior mailthread [1] templates being copied from a >>random zone was fixed in 4.3. The code is not present in master (or >>4.4) is this solved in another way later on? The commit doesn't >>cleanly cherry-pick. It is hurting us in 4.2 so let me know if it pays >>cleaning it for master, please. >> >>[1] http://markmail.org/message/4cn5pn4e7butyj2c >> >>-- >>Daan > -- Daan
