Pranav, thanks for the heads-up. I can easily fix this issue. The error does 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 this bug. I can open separate bugs for those. Jessica T. CloudStack Tech Pubs -----Original Message----- From: Pranav Saxena [mailto:pranav.sax...@citrix.com] Sent: Monday, February 04, 2013 9:16 PM To: cloudstack-dev@incubator.apache.org Cc: lo...@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 forked out of master and this is will be the release branch while the ongoing developments for the later releases would still be happening in the master branch itself . But this does not mean that we won't be committing anything to 4.1 since there could be many bug fixes/regression failures which need to be handled for 4.1 release. Regarding the bug you mentioned , it could have been the case that the somebody fixed the bug in 4.1 as part of bug fixes but forgot to put it in master. I think the fix should go in master as well . I'll ask one of the documentation team members to have a look at this. Hope you got the point here. Thanks, Pranav -----Original Message----- From: Logan McNaughton [mailto:lo...@bacoosta.com] 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 been 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?
