On Thu, 2010-07-22 at 07:50 -0400, Jeff Squyres wrote: > I think I probably wasn't clear to Nadia in my instructions for ticket #2492. > So I have updated CMR procedures on the wiki: > > https://svn.open-mpi.org/trac/ompi/wiki/SubmittingChangesetMoveReqs > > In general: > > - Only the gatekeeper and administrators are supposed to commit to release > branches. > - The CMR process is what queues up commits for gatekeepers to apply to > release branches. > - If you have a CMR that contains one or more r numbers that don't apply > cleanly to the target release branch (e.g., if it creates conflicts), the > gatekeeper will kick it back to the submitter to fix. > - You fix it by getting a SVN checkout of the branch and creating a specific > patch. > - You should then apply that patch to the ticket and let the gatekeeper apply > it. > >
Oops, so sorry. So now I have the answer to my question: I was wondering why you wanted me to attach the patch to the CMR... > > > Begin forwarded message: > > > From: <derb...@osl.iu.edu> > > Date: July 22, 2010 7:06:00 AM EDT > > To: <svn-f...@open-mpi.org> > > Subject: [OMPI svn-full] svn:open-mpi r23474 > > Reply-To: <de...@open-mpi.org> > > > > Author: derbeyn > > Date: 2010-07-22 07:05:59 EDT (Thu, 22 Jul 2010) > > New Revision: 23474 > > URL: https://svn.open-mpi.org/trac/ompi/changeset/23474 > > > > Log: > > Fixes ticket 2492: Wrong event_type value passed in to show_help when > > getting xrc async events > > Text files modified: > > branches/v1.5/ompi/mca/btl/openib/btl_openib_async.c | 5 +++-- > > > > 1 files changed, 3 insertions(+), 2 deletions(-) > > > > Modified: branches/v1.5/ompi/mca/btl/openib/btl_openib_async.c > > ============================================================================== > > --- branches/v1.5/ompi/mca/btl/openib/btl_openib_async.c (original) > > +++ branches/v1.5/ompi/mca/btl/openib/btl_openib_async.c 2010-07-22 > > 07:05:59 EDT (Thu, 22 Jul 2010) > > @@ -350,7 +350,8 @@ > > case IBV_EVENT_PORT_ERR: > > orte_show_help("help-mpi-btl-openib.txt", "of error event", > > true,orte_process_info.nodename, orte_process_info.pid, > > - event.event_type, > > openib_event_to_str(event.event_type), > > + event_type, > > + openib_event_to_str((enum ibv_event_type)event_type), > > xrc_event ? "true" : "false"); > > break; > > case IBV_EVENT_COMM_EST: > > @@ -376,7 +377,7 @@ > > default: > > orte_show_help("help-mpi-btl-openib.txt", "of unknown > > event", > > true,orte_process_info.nodename, > > orte_process_info.pid, > > - event.event_type, xrc_event ? "true" : "false"); > > + event_type, xrc_event ? "true" : "false"); > > } > > ibv_ack_async_event(&event); > > } else { > > _______________________________________________ > > svn-full mailing list > > svn-f...@open-mpi.org > > http://www.open-mpi.org/mailman/listinfo.cgi/svn-full > > > > -- nadia.derbey <nadia.der...@bull.net>
