> On Oct. 18, 2012, 10:30 a.m., David Nalley wrote: > > I just tried with the latest iteration and it still isn't applying > > > > [ke4qqq@mba incubator-cloudstack]$ git am 344.patch > > Applying: fix for cloudstack-344 > > error: patch failed: docs/en-US/citrix-xenserver-installation.xml:21 > > error: docs/en-US/citrix-xenserver-installation.xml: patch does not apply > > Patch failed at 0001 fix for cloudstack-344 > > The copy of the patch that failed is found in: > > > > /home/ke4qqq/Documents/apache/cloudstack/incubator-cloudstack/.git/rebase-apply/patch > > When you have resolved this problem run "git am --resolved". > > If you would prefer to skip this patch, instead run "git am --skip". > > To restore the original branch and stop patching run "git am --abort". > >
when i tested, it's applied correctly. Let me double check - Radhika ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/7636/#review12560 ----------------------------------------------------------- On Oct. 18, 2012, 8:12 a.m., Radhika PC wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/7636/ > ----------------------------------------------------------- > > (Updated Oct. 18, 2012, 8:12 a.m.) > > > Review request for cloudstack, David Nalley, Chip Childers, Jessica Tomechak, > and Wido den Hollander. > > > Description > ------- > > location for many of the cloud-* tools is updated to point to the new location > > > This addresses bug Cloudstack-344. > > > Diffs > ----- > > docs/en-US/citrix-xenserver-installation.xml b8ab592 > docs/en-US/host-add-xenserver-kvm-ovm.xml 7101332 > docs/en-US/management-server-install-systemvm.xml c2c1212 > docs/en-US/prepare-system-vm-template.xml 160cea4 > > Diff: https://reviews.apache.org/r/7636/diff/ > > > Testing > ------- > > Patch cleanly applies. > > > Thanks, > > Radhika PC > >
