qpid-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Rupert Smith" <rupertlssm...@googlemail.com>
Subject Re: M2 -> Trunk Merge Complete
Date Mon, 17 Sep 2007 16:11:36 GMT
I'll leave those alone then Gordon. Presumably they are C++ changes anyway,
so won't cause any difficulties with merging the Java.

On 17/09/2007, Gordon Sim <gsim@redhat.com> wrote:
>
> Rupert Smith wrote:
> > ------------------------------------------------------------------------
> > 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.
>
> Don't merge these two, they aren't relevant to trunk anymore.
>
> > ------------------------------------------------------------------------
> > r565284 | gsim | 2007-08-13 10:41:45 +0100 (Mon, 13 Aug 2007) | 3 lines
> >
> > Fixes for QPID-544 and QPID-548
>
> This one is a very small change and may be simpler to merge by hand due
> to likely conflicts. I can do that at some point if you want to just
> mark it as merged (or blocked or whatever).
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message