> This adjusts our schedule a little bit, and also assumes that the work > to re-base javelin against master (yet again) will go smoothly and > quickly. If the Javelin branch isn't able to get to a stable state > quickly, we will need to consider not merging it in for 4.1.0. >
+1 on the plan in general. My problem is with the last bit here. Javelin has requested for merge a long time and is ready as of last Friday. We agree to this plan to lessen the work for others so I don't see why it should be that javelin may not be able to merge into 4.1.0. --Alex
