Branch 2.0.x has been created

[Leif Hedstrom <zw...@apache.org>]

Hi all,

I've created a 2.0.x branch for both "traffic" and "site" (the docs). 
Gavin will also create a build-bot instance for the 2.0.x branch. Please 
consider trunk "open" again for new development. In particular, John's 
and George's "dev" branch can be merged back to trunk any time.

Going forward, the same policy of RTC applies to both the trunk and 
2.0.x branch (unless the community votes for a change in policy). For 
the release branch, no new features should be added (at least not 
without a lazy consent vote). Bugs that needs to be fixed for a branch 
should be properly tagged as well (let me know if we're missing any 
"targets" in the Jira setup).

Thanks!

-- Leif

Re: Branch 2.0.x has been created

[Leif Hedstrom <zw...@apache.org>]

On 02/23/2010 11:20 PM, John Plevyak wrote:
> I reviewed the discussion on -dev and it seems that most folks (including
> you on 11/12/2009) were in support of CTR for trunk.
>
> As far as I can tell, the end of the discussion was an argument for CTR
> for "small" changes and branch/patch + RTC for "large" changes.
> This was 11-12-2009/11-13-2009 with the last message by bcall.
>
> I just did a search on RTC, review in -dev.
>    

Right, that's why I mentioned we can have a "vote" to change this 
"implicit" RTC that has been in place since we first started. For the 
most part, it seems we have been doing RTC for all development, and I 
wanted to make sure we just don't change something now without a 
decision from the PPMC.

Sorry if I confused the issue, I guess there hasn't exactly been a PPMC 
policy, but more of a "legacy" RTC policy. Should we vote on having an 
official checkin policy? It's something we need to have defined before 
graduation anyways.

-- Leif

Re: Branch 2.0.x has been created

[John Plevyak <jp...@acm.org>]

I reviewed the discussion on -dev and it seems that most folks (including
you on 11/12/2009) were in support of CTR for trunk.

As far as I can tell, the end of the discussion was an argument for CTR
for "small" changes and branch/patch + RTC for "large" changes.
This was 11-12-2009/11-13-2009 with the last message by bcall.

I just did a search on RTC, review in -dev.

john

On 2/23/2010 2:32 PM, Leif Hedstrom wrote:
> Hi all,
> 
> I've created a 2.0.x branch for both "traffic" and "site" (the docs).
> Gavin will also create a build-bot instance for the 2.0.x branch. Please
> consider trunk "open" again for new development. In particular, John's
> and George's "dev" branch can be merged back to trunk any time.
> 
> Going forward, the same policy of RTC applies to both the trunk and
> 2.0.x branch (unless the community votes for a change in policy). For
> the release branch, no new features should be added (at least not
> without a lazy consent vote). Bugs that needs to be fixed for a branch
> should be properly tagged as well (let me know if we're missing any
> "targets" in the Jira setup).
> 
> Thanks!
> 
> -- Leif

Re: Branch 2.0.x has been created (trunk is back open)

[George Paul <ge...@apache.org>]

Hi Everyone,
Trunk is open again. Done with the merge of 'dev' back into 'trunk'.
Please let me/John know if there are any issues with this merge.
thanks,
-George

On 2/24/10 8:01 AM, Leif Hedstrom wrote:
> On 02/24/2010 08:58 AM, George Paul wrote:
>> Hi Everyone,
>>
>> I am starting the merge of 'dev' branch back onto 'trunk' today and hope
>> to be done by EOD if not sooner. If possible I would like to 'close'
>> trunk down for that period. Please let me know if that will cause any
>> issues.
>>    
> 
> +1, keep it closed as long as you need.
> 
> -- Leif
> 

Re: Branch 2.0.x has been created

[Leif Hedstrom <zw...@apache.org>]

On 02/24/2010 08:58 AM, George Paul wrote:
> Hi Everyone,
>
> I am starting the merge of 'dev' branch back onto 'trunk' today and hope
> to be done by EOD if not sooner. If possible I would like to 'close'
> trunk down for that period. Please let me know if that will cause any
> issues.
>    

+1, keep it closed as long as you need.

-- Leif

Re: Branch 2.0.x has been created

[George Paul <ge...@yahoo.com>]

Hi Everyone,

I am starting the merge of 'dev' branch back onto 'trunk' today and hope
to be done by EOD if not sooner. If possible I would like to 'close'
trunk down for that period. Please let me know if that will cause any
issues.

thanks,

-George

On 2/23/10 2:32 PM, Leif Hedstrom wrote:
> Hi all,
> 
> I've created a 2.0.x branch for both "traffic" and "site" (the docs).
> Gavin will also create a build-bot instance for the 2.0.x branch. Please
> consider trunk "open" again for new development. In particular, John's
> and George's "dev" branch can be merged back to trunk any time.
> 
> Going forward, the same policy of RTC applies to both the trunk and
> 2.0.x branch (unless the community votes for a change in policy). For
> the release branch, no new features should be added (at least not
> without a lazy consent vote). Bugs that needs to be fixed for a branch
> should be properly tagged as well (let me know if we're missing any
> "targets" in the Jira setup).
> 
> Thanks!
> 
> -- Leif