Mailing-List: contact cloudstack-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cloudstack-dev@incubator.apache.org
Received-SPF: pass (nike.apache.org: domain of Jessica.Tomechak@citrix.com
 designates 66.165.176.89 as permitted sender)
From: Jessica Tomechak <Jessica.Tomechak@citrix.com>
To: "cloudstack-dev@incubator.apache.org"
	<cloudstack-dev@incubator.apache.org>
CC: "logan@bacoosta.com" <logan@bacoosta.com>
Date: Tue, 5 Feb 2013 03:51:59 -0800
Subject: RE: Git question
Thread-Topic: Git question
Thread-Index: Ac4DOTG0+6mrw3QXSMGPOf/4OOB7QAAJZrbgAA4IpzA=
Message-ID: 
 <7A92FF96DF135843B4B608FB576BFC3E012DA4102C37@SJCPMAILBOX01.citrite.net>
References: 
 <CA+NskW48V1hp6XJdpwy9fKs-BpWJ9REGaRrTFrDxBuTnA4rRaA@mail.gmail.com>
 <67EF18FDCA335F489B366120481AB6C5F6BCD4378F@BANPMAILBOX01.citrite.net>
In-Reply-To: 
 <67EF18FDCA335F489B366120481AB6C5F6BCD4378F@BANPMAILBOX01.citrite.net>
Accept-Language: en-US
Content-Language: en-US
acceptlanguage: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

Pranav, thanks for the heads-up. I can easily fix this issue. The error doe=
s not exist in master, so I will check in the fix only to 4.1.

There are still some build errors on the docs in 4.1, even after fixing thi=
s bug. I can open separate bugs for those.

Jessica T.
CloudStack Tech Pubs


-----Original Message-----
From: Pranav Saxena [mailto:pranav.saxena@citrix.com]=20
Sent: Monday, February 04, 2013 9:16 PM
To: cloudstack-dev@incubator.apache.org
Cc: logan@bacoosta.com
Subject: RE: Git question

So this is how it works -  all the work Is done on the master branch . When=
 a release it supposed to happen (4.1 in our case) , this branch has been f=
orked out of master and this is will be the release branch while the ongoin=
g developments for the later releases would still be happening in the maste=
r branch itself . But this does not mean that we won't be committing anythi=
ng to 4.1 since there could be many bug fixes/regression failures which nee=
d to be handled for 4.1 release.

Regarding the bug you mentioned , it could have been the case that the some=
body fixed the bug in 4.1 as part of bug fixes but forgot to put it in mast=
er. I think the fix should go in master as well . I'll ask one of the docum=
entation team members to have a look at this.

Hope you got the point here.

Thanks,
Pranav

-----Original Message-----
From: Logan McNaughton [mailto:logan@bacoosta.com]=20
Sent: Tuesday, February 05, 2013 6:08 AM
To: cloudstack-dev@incubator.apache.org
Subject: Git question

Hi, I'm new to committing, I have a question about branches that may have b=
een answered before:

What is the purpose of the "master" branch? For instance, I found a problem=
 in CLOUDSTACK-1152 that affects the 4.1 branch (a missing </para> in the
docs) but the </para> is there in master.

I guess my question is, why is there a "master" branch? Why aren't changes =
just merged directly into 4.1 or 4.0.2 or whatever the version may be?