> On Jan. 28, 2013, 3:19 p.m., David Nalley wrote: > > This does not apply for me. > > > > [ke4qqq@mba docs]$ git am foo.patch > > Applying: fix for CLOUDSTACK-1048 > > error: patch failed: docs/en-US/sticky-session-policies-for-lb-rules.xml:3 > > error: docs/en-US/sticky-session-policies-for-lb-rules.xml: patch does not > > apply > > Patch failed at 0001 fix for CLOUDSTACK-1048 > > 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". > > > > > > Almost as if it were generated off of a different copy of the files in > > question since this is a simple two file patch. > > You are basing your work in master, right? > > This review is only three days old, and afaict, no one has touched the two > > files in question in the past week. > > > > --David
Looks like I goofed up something in the github. I took patch against my github repo. Sending another patch - Radhika ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/9097/#review15748 ----------------------------------------------------------- On Jan. 29, 2013, 5:32 a.m., Radhika PC wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/9097/ > ----------------------------------------------------------- > > (Updated Jan. 29, 2013, 5:32 a.m.) > > > Review request for cloudstack, Chip Childers, Jessica Tomechak, and Joe > Brockmeier. > > > Description > ------- > > Documentation on Adding a Load Balancer Rule and Sticky Session Policies for > Load Balancer Rules > > > This addresses bug CLOUDSTACK-1050. > > > Diffs > ----- > > docs/en-US/add-load-balancer-rule.xml 8cd0da4 > docs/en-US/load-balancer-rules.xml 8dd7d3b > docs/en-US/sticky-session-policies-for-lb-rules.xml a8acfa0 > > Diff: https://reviews.apache.org/r/9097/diff/ > > > Testing > ------- > > Patch applies, > > > Thanks, > > Radhika PC > >
