Hi Daan, One commit is missing in master involving the same file. Hence the patch is not getting applied. Can you please cherry-pick commit af2646f9a813b86ad8ce2987a11e64ac45833345 (4.2 branch) to master branch and then apply this patch on top of that? That should succeed.
Regards, Gaurav On Thu, Oct 17, 2013 at 11:25 PM, Daan Hoogland <daan.hoogl...@gmail.com>wrote: > Gaurav, I will but it doesn't apply to master. Can you update it? > > regards, > > On Wed, Oct 16, 2013 at 6:43 PM, Girish Shilamkar <gir...@clogeny.com> > wrote: > > > > > >> On Oct. 8, 2013, 11:14 a.m., abhinav roy wrote: > >> > Ship It! > > > > Can someone commit this patch. > > > > > > - Girish > > > > > > ----------------------------------------------------------- > > This is an automatically generated e-mail. To reply, visit: > > https://reviews.apache.org/r/14334/#review26770 > > ----------------------------------------------------------- > > > > > > On Sept. 25, 2013, 11:06 a.m., Gaurav Aradhye wrote: > >> > >> ----------------------------------------------------------- > >> This is an automatically generated e-mail. To reply, visit: > >> https://reviews.apache.org/r/14334/ > >> ----------------------------------------------------------- > >> > >> (Updated Sept. 25, 2013, 11:06 a.m.) > >> > >> > >> Review request for cloudstack, sailaja mada and Prasanna Santhanam. > >> > >> > >> Repository: cloudstack-git > >> > >> > >> Description > >> ------- > >> > >> Fixed CLOUDSTACK 4705: > >> Removed attribute error and fixed indentation issues. > >> > >> Added update_resource_count method to update the resource count after > upgrading and downgrading the service offering so as to get latest count. > Issue was found that it was showing old resource count without calling this > API. > >> > >> > >> Diffs > >> ----- > >> > >> test/integration/component/memory_limits/test_domain_limits.py 479ec0b > >> > >> Diff: https://reviews.apache.org/r/14334/diff/ > >> > >> > >> Testing > >> ------- > >> > >> > >> Thanks, > >> > >> Gaurav Aradhye > >> > >> > > >
