Return-Path: Delivered-To: apmail-felix-dev-archive@www.apache.org Received: (qmail 67380 invoked from network); 1 Dec 2009 23:22:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Dec 2009 23:22:11 -0000 Received: (qmail 44721 invoked by uid 500); 1 Dec 2009 23:22:11 -0000 Delivered-To: apmail-felix-dev-archive@felix.apache.org Received: (qmail 44641 invoked by uid 500); 1 Dec 2009 23:22:11 -0000 Mailing-List: contact dev-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list dev@felix.apache.org Received: (qmail 44631 invoked by uid 99); 1 Dec 2009 23:22:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2009 23:22:11 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=BAYES_00 X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [209.85.210.203] (HELO mail-yx0-f203.google.com) (209.85.210.203) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2009 23:22:08 +0000 Received: by yxe41 with SMTP id 41so8908424yxe.30 for ; Tue, 01 Dec 2009 15:21:47 -0800 (PST) MIME-Version: 1.0 Received: by 10.101.166.27 with SMTP id t27mr3101664ano.28.1259709707775; Tue, 01 Dec 2009 15:21:47 -0800 (PST) In-Reply-To: <487a994c0912011501v17845c2dm5532a1da0d0f3b34@mail.gmail.com> References: <436d9a250912011449y5767198ewdd3820c55d8e74f5@mail.gmail.com> <487a994c0912011501v17845c2dm5532a1da0d0f3b34@mail.gmail.com> Date: Wed, 2 Dec 2009 10:21:47 +1100 Message-ID: <436d9a250912011521l58f7b8f7jf7550e404b40c255@mail.gmail.com> Subject: Re: Is Felix trunk on 2.2 now? From: Don Brown To: dev@felix.apache.org Content-Type: text/plain; charset=ISO-8859-1 On Wed, Dec 2, 2009 at 10:01 AM, Karl Pauls wrote: > On Tue, Dec 1, 2009 at 11:49 PM, Don Brown wrote: >> I noticed that some tickets are being resolved against 2.2, so I take >> it to mean trunk is now 2.2. > > Not necessarily. We will move them back if we don't go to 2.2 with the > next release. Ok, so I take this to mean that all the changes being made now could still be considered stable bug fixes that shouldn't impact backwards compatibility in terms of API or functionality? I'm trying to determine which commits are safe to merge back into my stable branch. Thanks, Don