> On March 14, 2013, 1:36 a.m., David Nalley wrote: > > Prachi: > > > > This doesn't cleanly apply to 4.1 > > > > [ke4qqq@mba incubator-cloudstack]$ git am foo.patch > > Applying: CLOUDSTACK-1604: deploy VM failed when global setting > > "vm.allocation.algorithm" is set to "userdispersing" > > error: patch failed: > > server/src/com/cloud/deploy/AbstractDeployPlannerSelector.java:18 > > error: server/src/com/cloud/deploy/AbstractDeployPlannerSelector.java: > > patch does not apply > > > > error: patch failed: > > server/src/com/cloud/deploy/HypervisorVmPlannerSelector.java:18 > > error: server/src/com/cloud/deploy/HypervisorVmPlannerSelector.java: patch > > does not apply > > Patch failed at 0001 CLOUDSTACK-1604: deploy VM failed when global setting > > "vm.allocation.algorithm" is set to "userdispersing" > > The copy of the patch that failed is found in: > >
David, I could apply the patch using git apply command. I am not sure why git am fails. Is it possible for you to try git apply? - Prachi ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/9917/#review17845 ----------------------------------------------------------- On March 14, 2013, 1:17 a.m., Prachi Damle wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/9917/ > ----------------------------------------------------------- > > (Updated March 14, 2013, 1:17 a.m.) > > > Review request for cloudstack, David Nalley and Chip Childers. > > > Description > ------- > > CLOUDSTACK-1604: deploy VM failed when global setting > "vm.allocation.algorithm" is set to "userdispersing" > > Changes: > - DeployPlannerSelector was newly introduced for BareMetal feature. It had > the planner name hardcoded. > - Change it to decide the planner by referring to the global config > vm.allocation.algorithm value > > > Builds ok. > RAT check ok. > Functionality tested ok. > > > This addresses bug CLOUDSTACK-1604. > > > Diffs > ----- > > server/src/com/cloud/deploy/AbstractDeployPlannerSelector.java 62094eb > server/src/com/cloud/deploy/HypervisorVmPlannerSelector.java 034a9aa > > Diff: https://reviews.apache.org/r/9917/diff/ > > > Testing > ------- > > Successfully deployed VM using the UserDispersingPlanner or > UserConcentratedPodPlanner after changing the global setting. > > > Thanks, > > Prachi Damle > >
