Re: backporting r964349

If you feel you've resolved the conflicts appropriately, go ahead and commit. -Hyrum On Tue, Nov 9, 2010 at 7:05 PM, Daniel Shahaf wrote: > hwri...@apache.org wrote on Tue, Nov 09, 2010 at 20:09:53 -: >> * STATUS: Add note to the r964349 group. > >> @@ -350,6 +350,8 @@ Approved changes: >>  

backporting r964349

hwri...@apache.org wrote on Tue, Nov 09, 2010 at 20:09:53 -: > * STATUS: Add note to the r964349 group. > @@ -350,6 +350,8 @@ Approved changes: > Create fails.log files for test runs. > Justification: > Developer convenience. > + Notes: > + Somewhat non-trivial merge confli