Return-Path: Delivered-To: apmail-geronimo-activemq-dev-archive@www.apache.org Received: (qmail 21489 invoked from network); 26 May 2006 19:08:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 26 May 2006 19:08:50 -0000 Received: (qmail 39149 invoked by uid 500); 26 May 2006 19:08:50 -0000 Delivered-To: apmail-geronimo-activemq-dev-archive@geronimo.apache.org Received: (qmail 39047 invoked by uid 500); 26 May 2006 19:08:50 -0000 Mailing-List: contact activemq-dev-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-dev@geronimo.apache.org Received: (qmail 39038 invoked by uid 99); 26 May 2006 19:08:49 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 May 2006 12:08:49 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: domain of bruce.snyder@gmail.com designates 64.233.162.202 as permitted sender) Received: from [64.233.162.202] (HELO nz-out-0102.google.com) (64.233.162.202) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 May 2006 12:08:48 -0700 Received: by nz-out-0102.google.com with SMTP id j2so133921nzf for ; Fri, 26 May 2006 12:08:27 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=Xl3V8T33qPRvs2x4BUC4tKUlIulL0eIe1GiD5JRC3whEX+ZVme9HU66yGNvfbuu93hwqGdnadQFW0TVT8yBpG8osYvf2KgoYeQ4W9jlMihi6JFHK4VcxAt22Rp0ajGM/8iiO7GWoH7bLsyz6OGHhwopTJx+gsaoNxG1t7haRgcI= Received: by 10.65.211.10 with SMTP id n10mr111058qbq; Fri, 26 May 2006 12:08:26 -0700 (PDT) Received: by 10.64.48.13 with HTTP; Fri, 26 May 2006 12:08:26 -0700 (PDT) Message-ID: <7b3355cb0605261208n86f2a49u23305b9b126b55a9@mail.gmail.com> Date: Fri, 26 May 2006 13:08:26 -0600 From: "Bruce Snyder" To: activemq-dev@geronimo.apache.org Subject: Re: Stable branch for ActiveMQ 4.0.x patch releases In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <7b3355cb0605261001v3aae4f1ag472c9b83b21c00f2@mail.gmail.com> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N On 5/26/06, Hiram Chirino wrote: > > If you don't think we should merge bug fixes from > > branches/activemq-4.0.x to the trunk, how do you propose we get bug > > fixes into the next major release? > > > > Bug fixes needs to be merged manually into trunk and all other > branches manually by the person committing the fix. So the net effect > is that we constantly merging in bug fixes to both the stable and > trunk branch at concurrently. We don't wait to 'roll up' all the bug > fixes on the stable branch so they are merged into trunk. +1 Sounds good to me. Bruce -- perl -e 'print unpack("u30","D0G)U8V4\@4VYY9&5R\"F)R=6-E+G-N>61E