Re: implementing git workflow

2014-08-06 Thread Rajani Karuturi
below mail landed in the wrong thread. wanted to post on the git flow vote thread. Will post again on that thread for the folks following it. On Thu, Aug 7, 2014 at 10:08 AM, Rajani Karuturi wrote: > I am not advocating that we should follow git-flow. > > If you see my original [proposal], it h

Re: implementing git workflow

2014-08-06 Thread Rajani Karuturi
I am not advocating that we should follow git-flow. If you see my original [proposal], it has no mention of git-flow. I just felt that we are abusing git and put some points which could help us improve. Git-flow is something which I liked and felt that it would make us treat git well. I am okay

Re: implementing git workflow

2014-08-06 Thread Alena Prokharchyk
Agree with Daan. The first vote was needed to get the peoples opinions on whether we need to change our current git model (we certainly do as there are so many problems in the current flow), and the article was just the point of reference on how other people do it on the field. Now we have to see w

Re: implementing git workflow

2014-08-05 Thread Rajani Karuturi
I added a pre push hook to the [wiki page] which rejects any commits which doesn’t start with ‘Merge branch’ on master [wiki page] https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git#Git-githooks ~Rajani On 05-Aug-2014, at 6:48 pm, Daan Hoogland mailto:daan.hoogl...@gmail.com>> wro

Re: implementing git workflow

2014-08-05 Thread Daan Hoogland
I don't think we should hold on improving our way of working just because it is not perfect yet. Some things are unclear so we can't do those. Other things are perfectly clear and need to wait for nothing else. That doesn't mean that a second vote isn't needed. It is if not for anything else then f

Re: implementing git workflow

2014-08-05 Thread Rajani Karuturi
For a proposal which got all +1’s[1] what are the next steps to do?? It was made clear on the voting thread that required branching changes would be done if the vote passes[2] Though the content in the document changed, the original proposal hasn’t changed. Its still the same. It is explained i

Re: implementing git workflow

2014-08-05 Thread David Nalley
On Tue, Aug 5, 2014 at 2:51 PM, Alena Prokharchyk wrote: > I think we should hold on with the git workflow implementation till all > the decisions on the items written by Leo, are discussed and finalized. > > The very beginning of ³git workflow vote² shows that the vote was just to > get people op

Re: implementing git workflow

2014-08-05 Thread Alena Prokharchyk
I think we should hold on with the git workflow implementation till all the decisions on the items written by Leo, are discussed and finalized. The very beginning of ³git workflow vote² shows that the vote was just to get people opinion on the proposal. Before adopting it and cutting the develop b

Re: implementing git workflow

2014-08-05 Thread David Nalley
> > we have two open questions to answer before that: > > 1. Can we enable a git hook to prevent the commits to master post the > > switch? > > It’s possible theoretically but to do that in less than 48 hours could be a > challenge, you can open a ticket on JIRA/ASF-infra or contact the fine folk

Re: implementing git workflow

2014-08-05 Thread Daan Hoogland
That sound good to me On Tue, Aug 5, 2014 at 2:15 PM, Rajani Karuturi wrote: > > On 05-Aug-2014, at 4:47 pm, Daan Hoogland wrote: > >> On Tue, Aug 5, 2014 at 12:45 PM, Rohit Yadav >> wrote: 1. Can we enable a git hook to prevent the commits to master post the switch? >>> >>> It’s po

Re: implementing git workflow

2014-08-05 Thread Rajani Karuturi
On 05-Aug-2014, at 4:47 pm, Daan Hoogland wrote: > On Tue, Aug 5, 2014 at 12:45 PM, Rohit Yadav > wrote: >>> 1. Can we enable a git hook to prevent the commits to master post the >>> switch? >> >> It’s possible theoretically but to do that in less than 48 hours could be a >> challenge, you

Re: implementing git workflow

2014-08-05 Thread Rajani Karuturi
~Rajani On 05-Aug-2014, at 4:15 pm, Rohit Yadav wrote: > Hi Rajani, > > On 05-Aug-2014, at 12:35 pm, Rajani Karuturi > wrote: > >> The switch to the new git flow is postponed to 7th aug. > > Thanks for that, this means you’ll do it again on 7th August 00:00UTC? I am planning to do this

Re: implementing git workflow

2014-08-05 Thread Daan Hoogland
On Tue, Aug 5, 2014 at 12:45 PM, Rohit Yadav wrote: >> 1. Can we enable a git hook to prevent the commits to master post the switch? > > It’s possible theoretically but to do that in less than 48 hours could be a > challenge, you can open a ticket on JIRA/ASF-infra or contact the fine folks > on

Re: implementing git workflow

2014-08-05 Thread Rohit Yadav
Hi Rajani, On 05-Aug-2014, at 12:35 pm, Rajani Karuturi wrote: > The switch to the new git flow is postponed to 7th aug. Thanks for that, this means you’ll do it again on 7th August 00:00UTC? Meanwhile this means we’re to follow our normal workflow and commit on master. > we have two open que

Re: implementing git workflow

2014-08-05 Thread Daan Hoogland
ad 1. Git hooks in the central repo require assistence of apache infra. I think all committers should be able to do this. If people don't comply their work should be reverted. ad 2. We shouldn't need an RM. The gitflow model implies that committers share the load of RM. On Tue, Aug 5, 2014 at 12:3

Re: implementing git workflow

2014-08-05 Thread Daan Hoogland
ust 05, 2014 5:46 AM > To: dev@cloudstack.apache.org > Subject: Re: implementing git workflow > > Hi Daan, > > I created develop branch on commit cc725e53e304781148a6bf077e05d844fe88207c > and pushed it. > > > I am trying to create the 4.5 branch. For this, I need to change the v

Re: implementing git workflow

2014-08-05 Thread Rajani Karuturi
The switch to the new git flow is postponed to 7th aug. we have two open questions to answer before that: 1. Can we enable a git hook to prevent the commits to master post the switch? 2. should we create the release branch as well or wait for RM to do it? ~Rajani On 05-Aug-2014, at 3:16 pm, R

RE: implementing git workflow

2014-08-05 Thread Santhosh Edukulla
From: Rajani Karuturi [rajani.karut...@citrix.com] Sent: Tuesday, August 05, 2014 5:46 AM To: dev@cloudstack.apache.org Subject: Re: implementing git workflow Hi Daan, I created develop branch on commit cc725e53e304781148a6bf077e05d844fe88207c and pushed it. I am trying to

Re: implementing git workflow

2014-08-05 Thread Rajani Karuturi
Hi Daan, I created develop branch on commit cc725e53e304781148a6bf077e05d844fe88207c and pushed it. I am trying to create the 4.5 branch. For this, I need to change the version number in develop branch. Release Procedure wiki mention a script to change to version number. [1] Is it safe to jus

Re: implementing git workflow

2014-08-05 Thread Daan Hoogland
On Tue, Aug 5, 2014 at 10:52 AM, Rajani Karuturi wrote: > Daan, > I think we should do the branch related changes[1] and make the switch. Are > we waiting for a RM for 4.5? > > [1] > https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git#Git-Movetogit-flow > > > ~Rajani No Rajani, We don't

Re: implementing git workflow

2014-08-05 Thread Rajani Karuturi
Daan, I think we should do the branch related changes[1] and make the switch. Are we waiting for a RM for 4.5? [1] https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git#Git-Movetogit-flow ~Rajani On 05-Aug-2014, at 1:01 pm, Daan Hoogland mailto:daan.hoogl...@gmail.com>> wrote: Leo, g

Re: implementing git workflow

2014-08-05 Thread Daan Hoogland
Leo, great work. I should volunteer you more often. (volunteer me back at will) Rajani, Yes you are absolutaly right on the one hand. No, the community had decided that it couldn't support beyond the next release as it is to small, on the other hand. In the middle: By just saying this you have pro

Re: implementing git workflow

2014-08-04 Thread Rajani Karuturi
Hi Leo, Thanks for the detailed wiki. shouldn’t we use git flow support for LTS releases? http://stackoverflow.com/a/16866118/201514 ~Rajani On 04-Aug-2014, at 7:29 pm, Leo Simons wrote: > Hey folks, > > Since Daan volunteered me to do some docs, I’ve updated Rohit’s page at >https:

implementing git workflow

2014-08-04 Thread Leo Simons
Hey folks, Since Daan volunteered me to do some docs, I’ve updated Rohit’s page at https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git with additional details. I went back through all the e-mails on the subject to find questions/concerns, addressed the ones I think have consensus and