You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Rajani Karuturi <Ra...@citrix.com> on 2014/08/05 11:38:33 UTC
NO commits to master
I am creating a develop branch on the latest master commit cc725e53e304781148a6bf077e05d844fe88207c and will update in a minute.
please wait for my next mail and push all the commit to develop branch there after.
~Rajani
Re: NO commits to master
Posted by Rajani Karuturi <Ra...@citrix.com>.
we had enough time since the vote passed. But, I agree we should have decided on dates.
master/develop are in sync right now. So, it should be a simple branch switch to develop and push.
some automated things like jenkins may need changes. other than that, I don’t see any issues.
A git hook is a good idea to prevent accidental commits. If we can put that I think we are good.
~Rajani
On 05-Aug-2014, at 3:20 pm, Rohit Yadav <ro...@shapeblue.com> wrote:
> Hi Rajani,
>
> Thanks for taking the initiative, people may still keep pushing onto master, so please give them a window of 24-48 hours so that everyone is informed, or alternatively you may sync commits from master to develop but I hope we don’t end up in branch based split-brain where some folks will continue checking into master and others to develop.
>
> Can anyone comment if we can put a git hook to drop pushes on master with help from ASF infra folks?
>
>
> On 05-Aug-2014, at 11:43 am, Rajani Karuturi <Ra...@citrix.com> wrote:
>
>> develop branch is created as of commit cc725e53e304781148a6bf077e05d844fe88207c
>>
>> Please do not commit anything to master and use the respective branches.
>> Please go through the detailed wiki by Leo @ https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git
>>
>>
>>
>> ~Rajani
>>
>>
>>
>> On 05-Aug-2014, at 3:08 pm, Rajani Karuturi <Ra...@citrix.com> wrote:
>>
>>> I am creating a develop branch on the latest master commit cc725e53e304781148a6bf077e05d844fe88207c and will update in a minute.
>>>
>>> please wait for my next mail and push all the commit to develop branch there after.
>>>
>>>
>>> ~Rajani
>>>
>>>
>>>
>>
>
> Regards,
> Rohit Yadav
> Software Architect, ShapeBlue
> M. +41 779015219 | rohit.yadav@shapeblue.com
> Blog: bhaisaab.org | Twitter: @_bhaisaab
>
>
>
>
> Find out more about ShapeBlue and our range of CloudStack related services
>
> IaaS Cloud Design & Build<http://shapeblue.com/iaas-cloud-design-and-build//>
> CSForge – rapid IaaS deployment framework<http://shapeblue.com/csforge/>
> CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
> CloudStack Infrastructure Support<http://shapeblue.com/cloudstack-infrastructure-support/>
> CloudStack Bootcamp Training Courses<http://shapeblue.com/cloudstack-training/>
>
> This email and any attachments to it may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of Shape Blue Ltd or related companies. If you are not the intended recipient of this email, you must neither take any action based upon its contents, nor copy or show it to anyone. Please contact the sender if you believe you have received this email in error. Shape Blue Ltd is a company incorporated in England & Wales. ShapeBlue Services India LLP is a company incorporated in India and is operated under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a company registered by The Republic of South Africa and is traded under license from Shape Blue Ltd. ShapeBlue is a registered trademark.
Re: NO commits to master
Posted by Daan Hoogland <da...@gmail.com>.
Rajani,
I think you did great work. The fact that more communication could
have helped is in no way on you. There is a wiki page with a proposal
that has been voted on. No -1!
Having said that let's put down a time line. One thing in there is, in
my opinion that as of now no one should commit to master without
having made a feature/bugfix branch first. Next we should put dates to
the branches we are ging to make. I don't think you should revert your
creation of the develop branch but it doesn't matter either way. 48
hours is fine. Let's put a date to the 4.4 branch as well.
Daan
On Tue, Aug 5, 2014 at 12:25 PM, Rajani Karuturi
<Ra...@citrix.com> wrote:
> Its not any simpler. Its going to be the same work.
>
> I am not convinced that delay is going to help. But, I am going to abandon the develop branch and create one 48hrs later.
>
>
> ~Rajani
>
>
>
> On 05-Aug-2014, at 3:46 pm, Koushik Das <ko...@citrix.com> wrote:
>
>> Why not cut out a new develop branch after the 24/48 hrs window and discard the current develop branch. That is much more simpler.
>>
>> -----Original Message-----
>> From: Rohit Yadav [mailto:rohit.yadav@shapeblue.com]
>> Sent: Tuesday, 5 August 2014 3:20 PM
>> To: dev@cloudstack.apache.org
>> Subject: Re: NO commits to master
>>
>> Hi Rajani,
>>
>> Thanks for taking the initiative, people may still keep pushing onto master, so please give them a window of 24-48 hours so that everyone is informed, or alternatively you may sync commits from master to develop but I hope we don't end up in branch based split-brain where some folks will continue checking into master and others to develop.
>>
>> Can anyone comment if we can put a git hook to drop pushes on master with help from ASF infra folks?
>>
>>
>> On 05-Aug-2014, at 11:43 am, Rajani Karuturi <Ra...@citrix.com> wrote:
>>
>>> develop branch is created as of commit cc725e53e304781148a6bf077e05d844fe88207c
>>>
>>> Please do not commit anything to master and use the respective branches.
>>> Please go through the detailed wiki by Leo @ https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git
>>>
>>>
>>>
>>> ~Rajani
>>>
>>>
>>>
>>> On 05-Aug-2014, at 3:08 pm, Rajani Karuturi <Ra...@citrix.com> wrote:
>>>
>>>> I am creating a develop branch on the latest master commit cc725e53e304781148a6bf077e05d844fe88207c and will update in a minute.
>>>>
>>>> please wait for my next mail and push all the commit to develop branch there after.
>>>>
>>>>
>>>> ~Rajani
>>>>
>>>>
>>>>
>>>
>>
>> Regards,
>> Rohit Yadav
>> Software Architect, ShapeBlue
>> M. +41 779015219 | rohit.yadav@shapeblue.com
>> Blog: bhaisaab.org | Twitter: @_bhaisaab
>>
>>
>>
>>
>> Find out more about ShapeBlue and our range of CloudStack related services
>>
>> IaaS Cloud Design & Build<http://shapeblue.com/iaas-cloud-design-and-build//>
>> CSForge - rapid IaaS deployment framework<http://shapeblue.com/csforge/>
>> CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
>> CloudStack Infrastructure Support<http://shapeblue.com/cloudstack-infrastructure-support/>
>> CloudStack Bootcamp Training Courses<http://shapeblue.com/cloudstack-training/>
>>
>> This email and any attachments to it may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of Shape Blue Ltd or related companies. If you are not the intended recipient of this email, you must neither take any action based upon its contents, nor copy or show it to anyone. Please contact the sender if you believe you have received this email in error. Shape Blue Ltd is a company incorporated in England & Wales. ShapeBlue Services India LLP is a company incorporated in India and is operated under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a company registered by The Republic of South Africa and is traded under license from Shape Blue Ltd. ShapeBlue is a registered trademark.
>
--
Daan
Re: NO commits to master
Posted by Rajani Karuturi <Ra...@citrix.com>.
Its not any simpler. Its going to be the same work.
I am not convinced that delay is going to help. But, I am going to abandon the develop branch and create one 48hrs later.
~Rajani
On 05-Aug-2014, at 3:46 pm, Koushik Das <ko...@citrix.com> wrote:
> Why not cut out a new develop branch after the 24/48 hrs window and discard the current develop branch. That is much more simpler.
>
> -----Original Message-----
> From: Rohit Yadav [mailto:rohit.yadav@shapeblue.com]
> Sent: Tuesday, 5 August 2014 3:20 PM
> To: dev@cloudstack.apache.org
> Subject: Re: NO commits to master
>
> Hi Rajani,
>
> Thanks for taking the initiative, people may still keep pushing onto master, so please give them a window of 24-48 hours so that everyone is informed, or alternatively you may sync commits from master to develop but I hope we don't end up in branch based split-brain where some folks will continue checking into master and others to develop.
>
> Can anyone comment if we can put a git hook to drop pushes on master with help from ASF infra folks?
>
>
> On 05-Aug-2014, at 11:43 am, Rajani Karuturi <Ra...@citrix.com> wrote:
>
>> develop branch is created as of commit cc725e53e304781148a6bf077e05d844fe88207c
>>
>> Please do not commit anything to master and use the respective branches.
>> Please go through the detailed wiki by Leo @ https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git
>>
>>
>>
>> ~Rajani
>>
>>
>>
>> On 05-Aug-2014, at 3:08 pm, Rajani Karuturi <Ra...@citrix.com> wrote:
>>
>>> I am creating a develop branch on the latest master commit cc725e53e304781148a6bf077e05d844fe88207c and will update in a minute.
>>>
>>> please wait for my next mail and push all the commit to develop branch there after.
>>>
>>>
>>> ~Rajani
>>>
>>>
>>>
>>
>
> Regards,
> Rohit Yadav
> Software Architect, ShapeBlue
> M. +41 779015219 | rohit.yadav@shapeblue.com
> Blog: bhaisaab.org | Twitter: @_bhaisaab
>
>
>
>
> Find out more about ShapeBlue and our range of CloudStack related services
>
> IaaS Cloud Design & Build<http://shapeblue.com/iaas-cloud-design-and-build//>
> CSForge - rapid IaaS deployment framework<http://shapeblue.com/csforge/>
> CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
> CloudStack Infrastructure Support<http://shapeblue.com/cloudstack-infrastructure-support/>
> CloudStack Bootcamp Training Courses<http://shapeblue.com/cloudstack-training/>
>
> This email and any attachments to it may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of Shape Blue Ltd or related companies. If you are not the intended recipient of this email, you must neither take any action based upon its contents, nor copy or show it to anyone. Please contact the sender if you believe you have received this email in error. Shape Blue Ltd is a company incorporated in England & Wales. ShapeBlue Services India LLP is a company incorporated in India and is operated under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a company registered by The Republic of South Africa and is traded under license from Shape Blue Ltd. ShapeBlue is a registered trademark.
RE: NO commits to master
Posted by Koushik Das <ko...@citrix.com>.
Why not cut out a new develop branch after the 24/48 hrs window and discard the current develop branch. That is much more simpler.
-----Original Message-----
From: Rohit Yadav [mailto:rohit.yadav@shapeblue.com]
Sent: Tuesday, 5 August 2014 3:20 PM
To: dev@cloudstack.apache.org
Subject: Re: NO commits to master
Hi Rajani,
Thanks for taking the initiative, people may still keep pushing onto master, so please give them a window of 24-48 hours so that everyone is informed, or alternatively you may sync commits from master to develop but I hope we don't end up in branch based split-brain where some folks will continue checking into master and others to develop.
Can anyone comment if we can put a git hook to drop pushes on master with help from ASF infra folks?
On 05-Aug-2014, at 11:43 am, Rajani Karuturi <Ra...@citrix.com> wrote:
> develop branch is created as of commit cc725e53e304781148a6bf077e05d844fe88207c
>
> Please do not commit anything to master and use the respective branches.
> Please go through the detailed wiki by Leo @ https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git
>
>
>
> ~Rajani
>
>
>
> On 05-Aug-2014, at 3:08 pm, Rajani Karuturi <Ra...@citrix.com> wrote:
>
>> I am creating a develop branch on the latest master commit cc725e53e304781148a6bf077e05d844fe88207c and will update in a minute.
>>
>> please wait for my next mail and push all the commit to develop branch there after.
>>
>>
>> ~Rajani
>>
>>
>>
>
Regards,
Rohit Yadav
Software Architect, ShapeBlue
M. +41 779015219 | rohit.yadav@shapeblue.com
Blog: bhaisaab.org | Twitter: @_bhaisaab
Find out more about ShapeBlue and our range of CloudStack related services
IaaS Cloud Design & Build<http://shapeblue.com/iaas-cloud-design-and-build//>
CSForge - rapid IaaS deployment framework<http://shapeblue.com/csforge/>
CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
CloudStack Infrastructure Support<http://shapeblue.com/cloudstack-infrastructure-support/>
CloudStack Bootcamp Training Courses<http://shapeblue.com/cloudstack-training/>
This email and any attachments to it may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of Shape Blue Ltd or related companies. If you are not the intended recipient of this email, you must neither take any action based upon its contents, nor copy or show it to anyone. Please contact the sender if you believe you have received this email in error. Shape Blue Ltd is a company incorporated in England & Wales. ShapeBlue Services India LLP is a company incorporated in India and is operated under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a company registered by The Republic of South Africa and is traded under license from Shape Blue Ltd. ShapeBlue is a registered trademark.
Re: NO commits to master
Posted by Rohit Yadav <ro...@shapeblue.com>.
Hi Rajani,
Thanks for taking the initiative, people may still keep pushing onto master, so please give them a window of 24-48 hours so that everyone is informed, or alternatively you may sync commits from master to develop but I hope we don’t end up in branch based split-brain where some folks will continue checking into master and others to develop.
Can anyone comment if we can put a git hook to drop pushes on master with help from ASF infra folks?
On 05-Aug-2014, at 11:43 am, Rajani Karuturi <Ra...@citrix.com> wrote:
> develop branch is created as of commit cc725e53e304781148a6bf077e05d844fe88207c
>
> Please do not commit anything to master and use the respective branches.
> Please go through the detailed wiki by Leo @ https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git
>
>
>
> ~Rajani
>
>
>
> On 05-Aug-2014, at 3:08 pm, Rajani Karuturi <Ra...@citrix.com> wrote:
>
>> I am creating a develop branch on the latest master commit cc725e53e304781148a6bf077e05d844fe88207c and will update in a minute.
>>
>> please wait for my next mail and push all the commit to develop branch there after.
>>
>>
>> ~Rajani
>>
>>
>>
>
Regards,
Rohit Yadav
Software Architect, ShapeBlue
M. +41 779015219 | rohit.yadav@shapeblue.com
Blog: bhaisaab.org | Twitter: @_bhaisaab
Find out more about ShapeBlue and our range of CloudStack related services
IaaS Cloud Design & Build<http://shapeblue.com/iaas-cloud-design-and-build//>
CSForge – rapid IaaS deployment framework<http://shapeblue.com/csforge/>
CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
CloudStack Infrastructure Support<http://shapeblue.com/cloudstack-infrastructure-support/>
CloudStack Bootcamp Training Courses<http://shapeblue.com/cloudstack-training/>
This email and any attachments to it may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of Shape Blue Ltd or related companies. If you are not the intended recipient of this email, you must neither take any action based upon its contents, nor copy or show it to anyone. Please contact the sender if you believe you have received this email in error. Shape Blue Ltd is a company incorporated in England & Wales. ShapeBlue Services India LLP is a company incorporated in India and is operated under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a company registered by The Republic of South Africa and is traded under license from Shape Blue Ltd. ShapeBlue is a registered trademark.
Re: NO commits to master
Posted by Rajani Karuturi <Ra...@citrix.com>.
develop branch is created as of commit cc725e53e304781148a6bf077e05d844fe88207c
Please do not commit anything to master and use the respective branches.
Please go through the detailed wiki by Leo @ https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git
~Rajani
On 05-Aug-2014, at 3:08 pm, Rajani Karuturi <Ra...@citrix.com> wrote:
> I am creating a develop branch on the latest master commit cc725e53e304781148a6bf077e05d844fe88207c and will update in a minute.
>
> please wait for my next mail and push all the commit to develop branch there after.
>
>
> ~Rajani
>
>
>