Mailing-List: contact dev-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@geronimo.apache.org
Received-SPF: pass (asf.osuosl.org: domain of ammulder@gmail.com designates
 64.233.166.181 as permitted sender)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws;
        s=beta; d=gmail.com;
        h=received:message-id:date:from:sender:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
        b=AnbqtPRq0ZrRLCPfLEKV4AUHi0GFognTiEVXZY8eJfN3koOyXNbJCjCfpGaGIOX4rHl7Ej1U3TEWnmXuohwJp8B6FIvI4IPvERM8BNUsbcORkMaqU30OntXvlL4sGldaO99EI3bwBgI3oiUOdcjBBMh04EGm95bHxm0ePcBTTWo=
Message-ID: <74e15baa0604101033k2e82d0afj214d1e14cb2f7c8b@mail.gmail.com>
Date: Mon, 10 Apr 2006 13:33:14 -0400
From: "Aaron Mulder" <ammulder@alumni.princeton.edu>
Sender: ammulder@gmail.com
To: dev@geronimo.apache.org
Subject: Re: Merging from 1.1 to HEAD
In-Reply-To: <443A74C2.1000703@hogstrom.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
References: <74e15baa0604081706y1e199bf5g8e328310ea1f4d15@mail.gmail.com>
	 <443A74C2.1000703@hogstrom.org>

I vote we plan to freeze on a Monday rather than a Friday, so we get
the weekend to cram in the last bits.  :)  I know there are a still
ton of JIRAs with my name on them for 1.1.

I'm a little worried that there have been some showstopper bugs in 1.1
that were only found and addressed in the last few days, but I guess
we have some time after the freeze to stabilize and we'll see what the
TCK reports as far as the main J2EE features go.

As far as what I want to merge in from HEAD, the new keystore portlet
and the configuration import/export features -- it's all in that one
JIRA of "stuff to merge from HEAD to 1.1".

Thanks,
    Aaron

On 4/10/06, Matt Hogstrom <matt@hogstrom.org> wrote:
> I was travelling yesterday so apologies for the late reply.
>
>
>
> Aaron Mulder wrote:
> > So I'm putting some stuff into 1.1, some of which is related to config
> > IDs and some of which is not.
> >
> > My question is, for the stuff unrelated to config IDs, should I be
> > merging to HEAD right away?  Or is it going to be easier if I don't
> > and we merge "everything" at once later?
> >
> > I have also previously put some things into HEAD which I would like to
> > get into 1.1.  I assume I should merge those to 1.1 soon, because I
> > expect we will prepare the 1.1 release before attempting to fully
> > merge 1.1 into HEAD.  Is that right?
>
> Move them sooner than later.  The original plan was to freeze code on Fri=
day.  We would then work
> the stable branch to CTS compliance and if there was time left layer in o=
ther stuff.  I really,
> really want to get this out by April 28th so that when Java One rolls aro=
und we aren't locked up in
> a hotel room trying to get a release done.  If it is risky please defer i=
t.
>
> What were the specific features you were looking at ?
>
> > Thanks,
> >     Aaron
> >
> >
> >
>