Re: [Summary] checkin process

2014-07-31 Thread Rohit Yadav
Hi Rajani, On 31-Jul-2014, at 11:55 am, Rajani Karuturi wrote: > ahh… we have the same content twice on the wiki. I deleted the duplicate and > edited it as per the comment from daan. > > https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git#Git-ProposedGitflowbasedCheck-inProcess > > +1 f

Re: [Summary] checkin process

2014-07-31 Thread Rajani Karuturi
ahh… we have the same content twice on the wiki. I deleted the duplicate and edited it as per the comment from daan. https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git#Git-ProposedGitflowbasedCheck-inProcess +1 for starting a vote thread ~Rajani On 31-Jul-2014, at 3:04 pm, Rohit Ya

Re: [Summary] checkin process

2014-07-31 Thread Rohit Yadav
Hi, Please use this section on the wiki to propose/fix/modify the new proposed check-in process: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git#Git-ProposedGitflowbasedCheck-inProcess My feedback: - I don’t want to enforce/adopt the gitflow model "as-is", like not rename master bra

Re: [Summary] checkin process

2014-07-31 Thread Rajani Karuturi
I updated the wiki https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git#Git-Gitflow ~Rajani On 31-Jul-2014, at 2:47 pm, Sebastien Goasguen mailto:run...@gmail.com>> wrote: On Jul 31, 2014, at 4:46 AM, Rajani Karuturi mailto:rajani.karut...@citrix.com>> wrote: to start using git-flo

Re: [Summary] checkin process

2014-07-31 Thread Sebastien Goasguen
On Jul 31, 2014, at 4:46 AM, Rajani Karuturi wrote: > to start using git-flow from 4.5+, we need to have the latest stable version > which can be master and I assumed that would be 4.4 > point 2. should be modified assuming no previous releases >>> 2a. branch ‘develop’ from 'master’ >>> 2b. bra

Re: [Summary] checkin process

2014-07-31 Thread Rajani Karuturi
to start using git-flow from 4.5+, we need to have the latest stable version which can be master and I assumed that would be 4.4 point 2. should be modified assuming no previous releases >> 2a. branch ‘develop’ from 'master’ >> 2b. branch ‘release/4.5' from the develop >> 2c. merge ‘release/4.5' t

Re: [Summary] checkin process

2014-07-31 Thread Sebastien Goasguen
On Jul 31, 2014, at 3:39 AM, Daan Hoogland wrote: > I answerred this from my phone but it did't get through so here my > comment again: > > We can't cut a new master from 4.4 without enormous work. I spend two > days on getting 4.4 in line with 4.4-forward and as Leo has shown the > work for ge

Re: [Summary] checkin process

2014-07-31 Thread Daan Hoogland
I answerred this from my phone but it did't get through so here my comment again: We can't cut a new master from 4.4 without enormous work. I spend two days on getting 4.4 in line with 4.4-forward and as Leo has shown the work for getting all features from master into master will be much greater.

Re: [Summary] checkin process

2014-07-31 Thread Daan Hoogland
Rajani, we can't cut a new master from 4.4 Leo's work on comparing the branches showed us that. So the new flow will be limited To master land 4.5+ biligual spelling checker used.read at your own risk Op 31 jul. 2014 06:22 schreef "Rajani Karuturi" : > For the git flow: > 1. We agreed to follow g

[Summary] checkin process

2014-07-30 Thread Rajani Karuturi
For the git flow: 1. We agreed to follow git-flow explained here http://nvie.com/posts/a-successful-git-branching-model/ 2. This is the proposal for first cut 2a. rename 'master' to 'develop’ 2b. branch a new 'master' from ‘4.4’ and update tags with release/4.4.0 2c. branch ‘release/4.5' from the