Return-Path: X-Original-To: apmail-incubator-cloudstack-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 49679C852 for ; Thu, 24 May 2012 21:19:55 +0000 (UTC) Received: (qmail 36688 invoked by uid 500); 24 May 2012 21:19:55 -0000 Delivered-To: apmail-incubator-cloudstack-dev-archive@incubator.apache.org Received: (qmail 36628 invoked by uid 500); 24 May 2012 21:19:55 -0000 Mailing-List: contact cloudstack-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-dev@incubator.apache.org Received: (qmail 36618 invoked by uid 99); 24 May 2012 21:19:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 May 2012 21:19:55 +0000 X-ASF-Spam-Status: No, hits=-5.0 required=5.0 tests=RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of Kevin.Kluge@citrix.com designates 66.165.176.89 as permitted sender) Received: from [66.165.176.89] (HELO SMTP.CITRIX.COM) (66.165.176.89) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 May 2012 21:19:49 +0000 X-IronPort-AV: E=Sophos;i="4.75,653,1330923600"; d="scan'208";a="25688918" Received: from sjcpmailmx02.citrite.net ([10.216.14.75]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 24 May 2012 17:19:19 -0400 Received: from SJCPMAILBOX01.citrite.net ([10.216.4.72]) by SJCPMAILMX02.citrite.net ([10.216.14.75]) with mapi; Thu, 24 May 2012 14:19:18 -0700 From: Kevin Kluge To: "cloudstack-dev@incubator.apache.org" Date: Thu, 24 May 2012 14:19:13 -0700 Subject: release code names (was RE: git migration heads up) Thread-Topic: release code names (was RE: git migration heads up) Thread-Index: Ac058qCcQKlGh4jfQkKky/Y+d70SSg== Message-ID: <61AE1E2837A06D4A8E98B796183842D40116B90AED74@SJCPMAILBOX01.citrite.net> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Also, I think we should take the pre-existing release codenames (Bonita, Bu= rbank, and Campo) and reserve them for Citrix commercial releases. The co= mmunity is moving to a different release cycle (with presumably different r= elease content) than Citrix had planned, and of course it can come up with = new codenames if desired. This clear assignment will help reduce confusio= n as we split Citrix and Apache release cycles. It will require further sc= rubbing in the bug db and on the wiki as these codenames are referenced the= re. -kevin > -----Original Message----- > From: David Nalley [mailto:david@gnsa.us] > Sent: Thursday, May 24, 2012 2:02 PM > To: cloudstack-dev@incubator.apache.org > Subject: Re: git migration heads up >=20 > On Thu, May 24, 2012 at 4:54 PM, Alena Prokharchyk > wrote: > > On 5/24/12 7:17 AM, "David Nalley" wrote: > > > >>Just an FYI: > >> > >>Mohammad and I are going to freeze github/git.cloud.com's 3.0.x and > >>master branches this weekend while we attempt to migrate them to the > >>ASF repo. The ASF repo will remain frozen until we can conclude a vote > >>(I understand that the PPMC must certify/accept the code drop), after > >>which the ASF repo should become the canonical repo for the project. > >> > > > > > > > > I have a question about the branch I'm currently working on - > > vpc-3.0.x (checkins for Burbank VAps feature go there). This branch is > > supposed to be merged to 3.0.x/master in about 2 weeks. > > > > Should we merge vpc-3.0.x to apache repo as well at this point? > > > > Thanks, > > -Alena. > > >=20 > Hi Alena: >=20 > It shouldn't be a problem to merge at a later point (and I am specificall= y trying > to keep the number of branches we initially bring over down just for > complexity's sake.) >=20 > When it's ready to merge you should still be able to do so. No need to ru= sh > things on your end. >=20 > you'll add a new remote to your existing local git config - we'll say you= run > something like 'git remote add asf https://git-wip- > us.apache.org/repos/asf?p=3Dincubator-cloudstack.git' >=20 > Then you should be able to trivially merge stuff from existing branches t= o the > ASF hosted repo (and create new branches there as > well) >=20 > --David