I would prefer the merge forward strategy as Rajani proposed, in which
case whoever merges inthe oldest branch could, it would then be
propagated upwards to master 'automatically'.
At the moment the author is the logical authority (pun not avoided)
On Thu, Nov 13, 2014 at 5:11 PM, Mike Tutkowski
That's a good point, Daan.
So, how's about this? We should make it the responsibility of the person
who created the hotfix branch to delete it (presumably after he/she has
determined that the fix(es) in the hotfix branch have gone into all
applicable locations).
On Thu, Nov 13, 2014 at 8:59 AM, D
I don't mind deleting it either but in our present model it needs
merging/picking into several branches. (cursing intended)
On Thu, Nov 13, 2014 at 4:51 PM, Mike Tutkowski
wrote:
> I don't mind deleting the branch myself, but I wonder if it makes more
> sense for the RM to do so once he/she has m
I don't mind deleting the branch myself, but I wonder if it makes more
sense for the RM to do so once he/she has merged the change(s) in from the
hotfix branch (as sort of another indication to the hotfix-branch submitter
that his/her fix(es) have been merged).
On Wed, Nov 12, 2014 at 2:02 AM, Daa
Hi Daan,
We have 1 fix to push into 4.4.2 that we need related to swift, it's an
easy quick fix but we haven't committed yet , still under test.
https://issues.apache.org/jira/browse/CLOUDSTACK-7887
On Wed, Nov 12, 2014 at 4:02 AM, Daan Hoogland
wrote:
> go ahead, no protocol carved in stone
Is it possible to add
CLOUDSTACK-7280
to 4.4.2
If it does not violate the principles of creating versions, I would be
grateful for the add.
Regards,
Tom
2014-11-11 15:40 GMT+01:00 Daan Hoogland :
> H,
>
> As we made a big boogy by have a different commit id used for the
> artifact as for the
go ahead, no protocol carved in stone. What do you suggest?
On Wed, Nov 12, 2014 at 5:18 AM, Mike Tutkowski
wrote:
> Hey Daan,
>
> What's the protocol once you merge the code in (which you have already done
> for me here)? Do I delete the hotfix branch or is that something you plan
> on doing?
>
Hey Daan,
What's the protocol once you merge the code in (which you have already done
for me here)? Do I delete the hotfix branch or is that something you plan
on doing?
Thanks!
Mike
On Tue, Nov 11, 2014 at 9:17 AM, Daan Hoogland
wrote:
> merged
>
> On Tue, Nov 11, 2014 at 5:05 PM, Mike Tutkow
and this commit fails to compile: I escaped the two "s that are the
problem but have no idea if that is the intended semantic. please have
a look at a2a82f517b124a993d77af1e962ec7f5b5639052
thanks
On Tue, Nov 11, 2014 at 9:49 PM, Daan Hoogland wrote:
> On Tue, Nov 11, 2014 at 8:21 PM, Wido den H
On Tue, Nov 11, 2014 at 8:21 PM, Wido den Hollander wrote:
> 3383
I only picked the last commit as it had a lot of conflicts. this is alright?
--
Daan
There is a hotfix branch for 3383
Could you merge that in?
Wido
> Op 11 nov. 2014 om 15:52 heeft Daan Hoogland het
> volgende geschreven:
>
> will contact you before I go (unless I find a mail here;)
>
>> On Tue, Nov 11, 2014 at 3:46 PM, Wido den Hollander wrote:
>>
>>
>>> On 11/11/2014
Yes, it looks fixed now in 4.4 branch, cheers!
Lucian
--
Sent from the Delta quadrant using Borg technology!
Nux!
www.nux.ro
- Original Message -
> From: "Daan Hoogland"
> To: "dev"
> Sent: Tuesday, 11 November, 2014 16:22:53
> Subject: Re: [DISCUSS
On Tue, Nov 11, 2014 at 5:19 PM, Nux! wrote:
> /opt/cloud/bin/createipAlias.sh
I think it is now createIpAlias.sh at least that is what the diff
says. (that is how it is called now)
--
Daan
-us.apache.org/repos/asf?p=cloudstack.git;h=912dc15
--
Sent from the Delta quadrant using Borg technology!
Nux!
www.nux.ro
- Original Message -
> From: "Daan Hoogland"
> To: "dev"
> Sent: Tuesday, 11 November, 2014 15:52:38
> Subject: Re: [DISCUSS][ACS44] rel
merged
On Tue, Nov 11, 2014 at 5:05 PM, Mike Tutkowski
wrote:
> Hi Daan,
>
> Here is the ticket:
>
> https://issues.apache.org/jira/browse/CLOUDSTACK-7883
>
> Here is the hotfix branch:
>
> hotfix/4.4/CLOUDSTACK-7883
>
> Thanks!
>
> Mike
>
> On Tue, Nov 11, 2014 at 8:03 AM, Daan Hoogland
> wrote
Hi Daan,
Here is the ticket:
https://issues.apache.org/jira/browse/CLOUDSTACK-7883
Here is the hotfix branch:
hotfix/4.4/CLOUDSTACK-7883
Thanks!
Mike
On Tue, Nov 11, 2014 at 8:03 AM, Daan Hoogland
wrote:
> Mike, make your own. name it hotfix/4.4/ and contact me.
>
> On Tue, Nov 11, 2014 at
> >> > Nux!
> >> > www.nux.ro
> >> >
> >> > - Original Message -
> >> >> From: "Daan Hoogland"
> >> >> To: "dev"
> >> >> Sent: Tuesday, 11 November, 2014 14:40:24
> >> >>
>> > Yes, fixed systemvms please!
>> > https://issues.apache.org/jira/browse/CLOUDSTACK-7781
>> >
>> > --
>> > Sent from the Delta quadrant using Borg technology!
>> >
>> > Nux!
>> > www.nux.ro
>> >
>> > - Original Mes
logy!
>
> Nux!
> www.nux.ro
>
> - Original Message -
>> From: "Daan Hoogland"
>> To: "dev"
>> Sent: Tuesday, 11 November, 2014 15:08:23
>> Subject: Re: [DISCUSS][ACS44] release 4.4.2
>
>> added the two commits mentioned there. ca
, 2014 15:08:23
> Subject: Re: [DISCUSS][ACS44] release 4.4.2
> added the two commits mentioned there. care to test?
>
> On Tue, Nov 11, 2014 at 3:59 PM, Nux! wrote:
>> Yes, fixed systemvms please!
>> https://issues.apache.org/jira/browse/CLOUDSTACK-7781
>>
>> --
Original Message -
> >> From: "Daan Hoogland"
> >> To: "dev"
> >> Sent: Tuesday, 11 November, 2014 14:40:24
> >> Subject: [DISCUSS][ACS44] release 4.4.2
> >
> >> H,
> >>
> >> As we made a big boogy by have
t;
> - Original Message -
>> From: "Daan Hoogland"
>> To: "dev"
>> Sent: Tuesday, 11 November, 2014 14:40:24
>> Subject: [DISCUSS][ACS44] release 4.4.2
>
>> H,
>>
>> As we made a big boogy by have a different commit id used
Mike, make your own. name it hotfix/4.4/ and contact me.
On Tue, Nov 11, 2014 at 3:55 PM, Mike Tutkowski
wrote:
> Yes, I have one. SolidFire-driver only code. Do we have a branch for this
> already?
>
> On Tuesday, November 11, 2014, Daan Hoogland
> wrote:
>
>> H,
>>
>> As we made a big boogy by
Yes, fixed systemvms please!
https://issues.apache.org/jira/browse/CLOUDSTACK-7781
--
Sent from the Delta quadrant using Borg technology!
Nux!
www.nux.ro
- Original Message -
> From: "Daan Hoogland"
> To: "dev"
> Sent: Tuesday, 11 November, 2014 14:40:
Yes, I have one. SolidFire-driver only code. Do we have a branch for this
already?
On Tuesday, November 11, 2014, Daan Hoogland
wrote:
> H,
>
> As we made a big boogy by have a different commit id used for the
> artifact as for the tag/vote, I need to create a new relase including
> vote. Does a
will contact you before I go (unless I find a mail here;)
On Tue, Nov 11, 2014 at 3:46 PM, Wido den Hollander wrote:
>
>
> On 11/11/2014 03:40 PM, Daan Hoogland wrote:
>> H,
>>
>> As we made a big boogy by have a different commit id used for the
>> artifact as for the tag/vote, I need to create a
On 11/11/2014 03:40 PM, Daan Hoogland wrote:
> H,
>
> As we made a big boogy by have a different commit id used for the
> artifact as for the tag/vote, I need to create a new relase including
> vote. Does anybody have last minute entries/fixes they want in? I plan
> to build tonight (about 21:00
H,
As we made a big boogy by have a different commit id used for the
artifact as for the tag/vote, I need to create a new relase including
vote. Does anybody have last minute entries/fixes they want in? I plan
to build tonight (about 21:00 UTC)
regards,
--
Daan
28 matches
Mail list logo
