Re: [PROPOSAL] Move to github PR only during moratorium on commit

I could get easily merge all my changes in 4.5 to master yesterday. Merge to master is no more a problem. Thanks to Rajani for fixing merge issues with master. I think, at least, from now we can keep the master mergable. For others who are interested in knowing what I¹ve just tried: 1. 2. Git c

Re: [PROPOSAL] Move to github PR only during moratorium on commit

I share your frustration Rajani, I made some steps which I feel are turned back now. I am giving up and really not feeling this is worth my effort anymore. People don't take the effort to commit on a branch. gating commits is and will not solve unwillingness. It will slow us down at committing bug

Re: [PROPOSAL] Move to github PR only during moratorium on commit

as Travis is happy and some of my tests went fine, I pushed the merge. ~Rajani On Wed, Nov 5, 2014 at 2:55 PM, Rajani Karuturi wrote: > Travis is happy with the merge. Can I push this? > > ~Rajani > > On Wed, Nov 5, 2014 at 12:38 PM, Rajani Karuturi > wrote: > >> I did merge -s ours and someho

Re: [PROPOSAL] Move to github PR only during moratorium on commit

Travis is happy with the merge. Can I push this? ~Rajani On Wed, Nov 5, 2014 at 12:38 PM, Rajani Karuturi wrote: > I did merge -s ours and somehow didnt see any issue. ( > https://github.com/apache/cloudstack/pull/36) > will wait for the Travis report ( > https://travis-ci.org/apache/cloudstack

Re: [PROPOSAL] Move to github PR only during moratorium on commit

These problems existed for 4.4 and the same continued to 4.5. Despite discussing lot of things, we didnt act on anything and we are continuing the same to 4.6 There is no plan whatsoever to address any of those issues. ~Rajani On Wed, Nov 5, 2014 at 2:33 AM, David Nalley wrote: > On Sun, Nov 2

Re: [PROPOSAL] Move to github PR only during moratorium on commit

I did merge -s ours and somehow didnt see any issue. ( https://github.com/apache/cloudstack/pull/36) will wait for the Travis report ( https://travis-ci.org/apache/cloudstack/builds/40033174) I havent used -X before. But, from the documentation I understood it as, the merge strategy will be applie

Re: [PROPOSAL] Move to github PR only during moratorium on commit

On Sun, Nov 2, 2014 at 11:40 PM, Rajani Karuturi wrote: > that means, we postponed the git problems to 4.6. :( > > It feels like as a community we are running away from making any changes to > the way we interact with git. We seem to discuss it a lot but, never act on > it. I don't think we are r

Re: [PROPOSAL] Move to github PR only during moratorium on commit

Id did do -s ours:) but if we don't merge -s ... -X ours it doesn't help. mobile dev with bilingual spelling checker used (read at your own risk) Op 3 nov. 2014 05:40 schreef "Rajani Karuturi" : > that means, we postponed the git problems to 4.6. :( > > It feels like as a community we are running

Re: [PROPOSAL] Move to github PR only during moratorium on commit

that means, we postponed the git problems to 4.6. :( It feels like as a community we are running away from making any changes to the way we interact with git. We seem to discuss it a lot but, never act on it. What I don't understand is, are we saying the way we use git is right? or are we just sh

Re: [PROPOSAL] Move to github PR only during moratorium on commit

On Fri, Oct 31, 2014 at 12:41 AM, Rajani Karuturi wrote: > Can we atleast follow the merge part of it? ie) commit to 4.5 and then > merge 4.5 to master? > > merging wont be easy unless everybody agrees and does merge for their > commits. > It won't work; master and 4.5 have both diverged, even if

Re: [PROPOSAL] Move to github PR only during moratorium on commit

Can we atleast follow the merge part of it? ie) commit to 4.5 and then merge 4.5 to master? merging wont be easy unless everybody agrees and does merge for their commits. ~Rajani On Thu, Oct 30, 2014 at 8:44 PM, David Nalley wrote: > Commit to 4.5 and master please. > > --David > > On Thu, Oct

Re: [PROPOSAL] Move to github PR only during moratorium on commit

Commit to 4.5 and master please. --David On Thu, Oct 30, 2014 at 6:21 AM, Srikanteswararao Talluri wrote: > Hey Folks, > > After all these discussions, What is the direction to commit the code to > master and 4.5? I have some commits on 4.5 which I would like to have them > on master too. How to

Re: [PROPOSAL] Move to github PR only during moratorium on commit

Hey Folks, After all these discussions, What is the direction to commit the code to master and 4.5? I have some commits on 4.5 which I would like to have them on master too. How to go about it? Thanks, ~Talluri On 23/10/14 11:47 am, "Animesh Chaturvedi" wrote: > > >> -Original Message-

Re: [PROPOSAL] Move to github PR only during moratorium on commit

At the moment it must be called 'hotfix/*' or 'bugfix/*'. we should add 'feature/*' to that. On Fri, Oct 24, 2014 at 11:11 PM, Mike Tutkowski wrote: > Cool...so, it sounds like any branch we create in the repo will > automatically have CI run against it post each commit. > > How do you know when

Re: [PROPOSAL] Move to github PR only during moratorium on commit

Cool...so, it sounds like any branch we create in the repo will automatically have CI run against it post each commit. How do you know when CI has completed and what the results are? At that point, you could treat your own branch (as Daan says) as the "forward" branch. Once CI has been successful

Re: [PROPOSAL] Move to github PR only during moratorium on commit

We do run ci on branches! mobile dev with bilingual spelling checker used (read at your own risk) Op 24 okt. 2014 20:38 schreef "Mike Tutkowski" : > Right, we just need to make sure CI comes into play before the merge. > > Hence my earlier reply to what Daan mention: > > "My main concern was CI r

Re: [PROPOSAL] Move to github PR only during moratorium on commit

mobile dev with bilingual spelling checker used (read at your own risk) Op 24 okt. 2014 20:30 schreef "David Nalley" : > > On Fri, Oct 24, 2014 at 3:12 AM, Daan Hoogland wrote: > > Mike, Why have everybody work on the same branch. people can work on > > their own branch and when they are done they

Re: [PROPOSAL] Move to github PR only during moratorium on commit

On Fri, Oct 24, 2014 at 3:12 AM, Daan Hoogland wrote: > Mike, Why have everybody work on the same branch. people can work on > their own branch and when they are done they can rebase on the tip see > ci success and then merge. The problem with forward branches is > abandoned work or work that for

Re: [PROPOSAL] Move to github PR only during moratorium on commit

Right, we just need to make sure CI comes into play before the merge. Hence my earlier reply to what Daan mention: "My main concern was CI running before the code was checked into the "real" branch from the staging branch." On Fri, Oct 24, 2014 at 12:28 PM, David Nalley wrote: > On Fri, Oct 24

Re: [PROPOSAL] Move to github PR only during moratorium on commit

rvedi < > > animesh.chaturv...@citrix.com> wrote: > > > >> > >> > >> > -Original Message- > >> > From: Daan Hoogland [mailto:daan.hoogl...@gmail.com] > >> > Sent: Thursday, October 23, 2014 1:31 AM > >> > To: d

Re: [PROPOSAL] Move to github PR only during moratorium on commit

the specified branch (not now and not with > future merges other people or yourself may do). > > > > On Thu, Oct 23, 2014 at 5:30 PM, Animesh Chaturvedi < > animesh.chaturv...@citrix.com> wrote: > >> >> >> > -Original Message----- >> > From: Daan

Re: [PROPOSAL] Move to github PR only during moratorium on commit

On Fri, Oct 24, 2014 at 1:30 AM, Animesh Chaturvedi wrote: >> I sttrongly disagree with Animesh here and think Rohit is overlooking a >> simple fact. At the moment the branches are for 'stabalizing'. >> Fixing on master first is in direct contradiction with that. >> >> We have not been stabalizin

Re: [PROPOSAL] Move to github PR only during moratorium on commit

chaturv...@citrix.com> wrote: > > > > -Original Message- > > From: Daan Hoogland [mailto:daan.hoogl...@gmail.com] > > Sent: Thursday, October 23, 2014 1:31 AM > > To: dev > > Subject: Re: [PROPOSAL] Move to github PR only during moratorium on > >

RE: [PROPOSAL] Move to github PR only during moratorium on commit

> -Original Message- > From: Daan Hoogland [mailto:daan.hoogl...@gmail.com] > Sent: Thursday, October 23, 2014 1:31 AM > To: dev > Subject: Re: [PROPOSAL] Move to github PR only during moratorium on > commit > > On Thu, Oct 23, 2014 at 10:22 AM, Rohit Yadav >

RE: [PROPOSAL] Move to github PR only during moratorium on commit

> -Original Message- > From: Rohit Yadav [mailto:rohit.ya...@shapeblue.com] > Sent: Thursday, October 23, 2014 1:22 AM > To: dev@cloudstack.apache.org > Subject: Re: [PROPOSAL] Move to github PR only during moratorium on > commit > > Hi, > > > On

Re: [PROPOSAL] Move to github PR only during moratorium on commit

On Thu, Oct 23, 2014 at 10:22 AM, Rohit Yadav wrote: > Hi, > >> On 23-Oct-2014, at 11:47 am, Animesh Chaturvedi >> wrote: ... >> The approach for fixing issues in release branch first and master later is >> not practical as we may miss out commits not made into master and future >> release reg

Re: [PROPOSAL] Move to github PR only during moratorium on commit

Hi, > On 23-Oct-2014, at 11:47 am, Animesh Chaturvedi > wrote: > > [Animesh] Sebastian you have brought up a good point dependency on QA team > from Citrix is an issue for the project. This was raised in the past as well > and Alex's proposal [1] few months back using CI was in my opinion is

RE: [PROPOSAL] Move to github PR only during moratorium on commit

> -Original Message- > From: sebgoa [mailto:run...@gmail.com] > Sent: Saturday, October 18, 2014 2:00 AM > To: dev@cloudstack.apache.org > Subject: [PROPOSAL] Move to github PR only during moratorium on > commit > > After [1] I would like to officially bring up the following proposal. >

Re: [PROPOSAL] Move to github PR only during moratorium on commit

On Oct 22, 2014, at 1:21 AM, David Nalley wrote: > Hi Sebastien: > > So I like the idea of: > > 1. Us putting up all inbound code for review. > 2. Gating that code on a testing pass > 3. Having someone else look at it before committing. > > I don't think that should mean that all code that wo

Re: [PROPOSAL] Move to github PR only during moratorium on commit

Hi Sebastien: So I like the idea of: 1. Us putting up all inbound code for review. 2. Gating that code on a testing pass 3. Having someone else look at it before committing. I don't think that should mean that all code that works gets an immediate pass. I also don't think that we should have n R

Re: [PROPOSAL] Move to github PR only during moratorium on commit

On Oct 21, 2014, at 9:36 AM, Daan Hoogland wrote: > Ok, no one says it so let me be the bad guy. > > > Nothing will work unless the citrix department in california agrees. They > have their in-house legacy proces to change and will not unless they can > sell it easily upstream. So whether we m

Re: [PROPOSAL] Move to github PR only during moratorium on commit

On Oct 21, 2014, at 6:32 AM, Mike Tutkowski wrote: > Code reviews are great. > > However, we will need to change our behavior quite a bit if code is to make > it in within a reasonable amount of time as code reviews today often don't > get done in a timely fashion. Just look at it as an incr

Re: [PROPOSAL] Move to github PR only during moratorium on commit

Ok, no one says it so let me be the bad guy. Nothing will work unless the citrix department in california agrees. They have their in-house legacy proces to change and will not unless they can sell it easily upstream. So whether we make a grand uninfied proposal or take small steps doesn't matter,

Re: [PROPOSAL] Move to github PR only during moratorium on commit

Code reviews are great. However, we will need to change our behavior quite a bit if code is to make it in within a reasonable amount of time as code reviews today often don't get done in a timely fashion. In a volunteer community, it's hard to "assign" work (including code reviews) to people (let

Re: [PROPOSAL] Move to github PR only during moratorium on commit

I like the way Stephen split it. Here is my vote. +1 on using github pull requests. +1 on compulsory code reviews and PRs even for committers and CI build pass before merging. +1 on merges from 4.5 to master and no individual commits(or cherry-picks) to the branches +0 on RM for master and commits

Re: [PROPOSAL] Move to github PR only during moratorium on commit

ogland daan.hoogl...@gmail.com>> > > Reply-To: "dev@cloudstack.apache.org<mailto:dev@cloudstack.apache.org>" > mailto:dev@cloudstack.apache.org>> > > Date: Monday, October 20, 2014 at 10:34 AM > > To: "dev@cloudstack.apache.org<mailto:d

Re: [PROPOSAL] Move to github PR only during moratorium on commit

t;dev@cloudstack.apache.org<mailto:dev@cloudstack.apache.org>" > mailto:dev@cloudstack.apache.org>> > Date: Monday, October 20, 2014 at 10:34 AM > To: "dev@cloudstack.apache.org<mailto:dev@cloudstack.apache.org>" > mailto:dev@cloudstack.apache.org>> > Subject: R

Re: [PROPOSAL] Move to github PR only during moratorium on commit

@cloudstack.apache.org>> Date: Monday, October 20, 2014 at 10:34 AM To: "dev@cloudstack.apache.org<mailto:dev@cloudstack.apache.org>" mailto:dev@cloudstack.apache.org>> Subject: Re: [PROPOSAL] Move to github PR only during moratorium on commit No Chiradeep, Pull of the req

Re: [PROPOSAL] Move to github PR only during moratorium on commit

No Chiradeep, Pull of the request will still be on the local committer repo and pushed to ASF infra (wip) On Mon, Oct 20, 2014 at 7:26 PM, Chiradeep Vittal < chiradeep.vit...@citrix.com> wrote: > Won’t this proposal make GitHub the canonical repository? I don’t see ASF > infra being too happy wit

Re: [PROPOSAL] Move to github PR only during moratorium on commit

On Mon, Oct 20, 2014 at 7:26 PM, Chiradeep Vittal < chiradeep.vit...@citrix.com> wrote: > Won’t this proposal make GitHub the canonical repository? I don’t see ASF > infra being too happy with that. > > Shouldn't have to, you can still merge/push to the ASF infra repository and only the PR would l

Re: [PROPOSAL] Move to github PR only during moratorium on commit

Won’t this proposal make GitHub the canonical repository? I don’t see ASF infra being too happy with that. From: sebgoa mailto:run...@gmail.com>> Reply-To: "dev@cloudstack.apache.org" mailto:dev@cloudstack.apache.org>> Date: Saturday, October 18, 2014 at 2:00 AM

Re: [PROPOSAL] Move to github PR only during moratorium on commit

On Sat, Oct 18, 2014 at 11:00 AM, sebgoa wrote: > After [1] I would like to officially bring up the following proposal. > > [Proposal] > > All commits come through github PR, *even* for committers. We declare a > moratorium period (agreed suspension of activity) during which direct > commit

Re: [PROPOSAL] Move to github PR only during moratorium on commit

I'm in complete agreement with Stephen on this one. I would be considered the master RM could be overwhelmed with work. Other than that +1. On 20 October 2014 14:13, Daan Hoogland wrote: > +1 and small changes should go through even if bigger goals glare on the > horizon. > > On Mon, Oct 20, 201

Re: [PROPOSAL] Move to github PR only during moratorium on commit

+1 and small changes should go through even if bigger goals glare on the horizon. On Mon, Oct 20, 2014 at 2:14 PM, sebgoa wrote: > > On Oct 20, 2014, at 1:51 PM, Stephen Turner > wrote: > > > As I just said in the other thread -- but to repeat it here in the > PROPOSAL thread -- > > > > I am +1

Re: [PROPOSAL] Move to github PR only during moratorium on commit

On Oct 20, 2014, at 1:51 PM, Stephen Turner wrote: > As I just said in the other thread -- but to repeat it here in the PROPOSAL > thread -- > > I am +1 on using github pull requests. > > I am +1 on all code changes being reviewed by a committer other than the > author, as well as undergoing

RE: [PROPOSAL] Move to github PR only during moratorium on commit

As I just said in the other thread -- but to repeat it here in the PROPOSAL thread -- I am +1 on using github pull requests. I am +1 on all code changes being reviewed by a committer other than the author, as well as undergoing some automated CI testing, before the pull request is merged. I a

Re: [PROPOSAL] Move to github PR only during moratorium on commit

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 10/18/2014 11:00 AM, sebgoa wrote: > After [1] I would like to officially bring up the following > proposal. > > [Proposal] All commits come through github PR, *even* for > committers. We declare a moratorium period (agreed suspension of > act

Re: [PROPOSAL] Move to github PR only during moratorium on commit

Hi, > On 18-Oct-2014, at 2:30 pm, sebgoa wrote: > > [Proposal] > > All commits come through github PR, *even* for committers. We declare a > moratorium period (agreed suspension of activity) during which direct commit > to master is forbidden. > Only the master RM is allowed to merge PR in