qpid-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Robert Greig" <robert.j.gr...@gmail.com>
Subject Re: M2 -> Trunk Merge Complete
Date Mon, 17 Sep 2007 15:52:14 GMT
Rupert, can you merge QPID-531 (that Martin did just before he went on
holiday) from the M2.1 branch into M2 (and trunk) first since that is
the only one that is outstanding for M2. Once that is merged we can
create another M2 build and vote on it.

RG

On 17/09/2007, Rupert Smith <rupertlssmith@googlemail.com> wrote:
> I will merge all outstanding changes from M2 to trunk soon. Can the authors
> of the following changes please indicate whether or not they are to be
> merged? (All of the other changes are test stuff that I was working on).
>
> Rupert
>
> ------------------------------------------------------------------------
> r575688 | rhs | 2007-09-14 15:04:38 +0100 (Fri, 14 Sep 2007) | 1 line
>
> Merged revision 572751 from the trunk, this fixes QPID-573.
>
> ------------------------------------------------------------------------
> r575663 | rgodfrey | 2007-09-14 13:43:13 +0100 (Fri, 14 Sep 2007) | 1 line
>
> QPID-600 : Deadlock on connection.close
>
> ------------------------------------------------------------------------
> r575253 | ritchiem | 2007-09-13 11:53:29 +0100 (Thu, 13 Sep 2007) | 1 line
>
> QPID-572 Applied test patch supplied by Aidan Skinner along with change to
> ConcurrentSelectorDeliveryManager that resolves the ordering problem.
>
> ------------------------------------------------------------------------
> r574876 | gsim | 2007-09-12 11:05:46 +0100 (Wed, 12 Sep 2007) | 3 lines
>
> Applied rev 573516 from M2.1: Fixes for QPID-581 & QPID-563
>
> ------------------------------------------------------------------------
> r574873 | gsim | 2007-09-12 10:55:30 +0100 (Wed, 12 Sep 2007) | 3 lines
>
> Applied fix (submitted as patch to qpid-dev by Nuno Santos): include headers
> used in posix wrappers.
>
> ------------------------------------------------------------------------
> r565284 | gsim | 2007-08-13 10:41:45 +0100 (Mon, 13 Aug 2007) | 3 lines
>
> Fixes for QPID-544 and QPID-548
>
> ------------------------------------------------------------------------
> r563986 | rhs | 2007-08-08 20:01:28 +0100 (Wed, 08 Aug 2007) | 1 line
>
> added missing requires
>
>
> On 17/09/2007, Rupert Smith <rupertlssmith@googlemail.com> wrote:
> >
> > On 30/08/2007, Martin Ritchie <ritchiem@apache.org> wrote:
> >
> > > There was a lot of file movements in the integrationtest/systest
> > > packages. I believe I have all the changes but if those more intimate
> > > with these tests could verify then that would be great.
> > >
> >
> >
> > I changed my mind a lot whilst writing these!
> >
> > You've got the changes merged onto trunk, mostly fine. There are one or
> > two things that slipped through, but I will copy them accross by hand just
> > now.
> >
> > I notice that svnmerge avail -S ../../branches/M2, still reports a list of
> > available changes to merge:
> >
> >
> > 561794,561855,562059,562066,562083,562124-562125,563434-563435,563440,563496-563497,563528-563529,563532,563986,564593,564618-564619,565284,
> > 565703,566643-566644,566665,567003,567006,567062-567064,567074,567083,567567,567727,567740,568141,568148,568165,568187,574873,574876,575253,
> >
> > 575663,575688
> >
> > Are these all changes made after your big merge? In which case they should
> > be merged too. Or if they have already been done, I will mark them as so.
> >
> > Now that M2 branch is pretty much closed, should we turn on svnmerge
> > tracking for M2 -> M2.1 (criticial fixes to M2, merged into M2.1) and for
> > M2.1 -> trunk (more siginificant post M2 work copied onto trunk)?
> >
> > Rupert
> >
>

Mime
View raw message