Well, maybe, we are not even far of from it. call 'master' 'develop'
and create a new 'master'. next make sure every body develops in a
feature branch. also call x.y-forward hotfix-x.y. Don't bet your life
this approach is going to save our world. What would really help is if
everybody would really
I see, Daan - thanks for the clarification.
This is probably another good reason why we should seriously consider
implementing the branching approach Sebastien recommended here:
http://nvie.com/posts/a-successful-git-branching-model/
On Thu, Jul 17, 2014 at 10:06 PM, Daan Hoogland
wrote:
> Th
That is not the confusion Mike. The problem is that some changes that
don't go into 4.4 keep causing conflicts. I made the mistake of adding
the conflicting lines this time. this 4.4-forward branch is not
suitable for providing cherry-picks for an RM because of this. I thin
people should just branc
Perhaps there is some confusion again as to the nature of the 4.4-forward
branch.
A while back, we agreed that changes put in here would not be cherry picked
to 4.4 unless requested so by the developer and agreed to by the RM.
Changes in 4.4-forward that do not go into 4.4 will at least go into 4
They keep coming in with cherry-picks that include this file. I will
remove them.
On Fri, Jul 18, 2014 at 12:22 AM, Nitin Mehta wrote:
> Hi Daan - I am not sure I get your point here. These changes were put in
> as I want them in 4.4.1, but were not critical enough to be put in 4.4.
>
> Thanks,
>
Hi Daan - I am not sure I get your point here. These changes were put in
as I want them in 4.4.1, but were not critical enough to be put in 4.4.
Thanks,
-Nitin
On 17/07/14 2:58 PM, "Daan Hoogland" wrote:
>sure? I saw that the last few lines where not in the last version.
>
>I'm not confortable
sure? I saw that the last few lines where not in the last version.
I'm not confortable with this bit, it has been coming up a few time
before already looks like some commit on 4.4-forward is trying to
sneak it's way into the release:
@@ -2439,4 +2474,16 @@
CONSTRAINT `fk_lb_healthcheck_policy_
Seems good, looks like was an issue with a newline somewhere. But deploydb
went fine on 4.4
Thanks,
Amogh
On 7/17/14 2:42 PM, "Daan Hoogland" wrote:
>Amogh, I couldn't help myself. please have a look at the resulting
>setup/db/db/schema-430to440.sql
>
>On Thu, Jul 17, 2014 at 11:35 PM, Daan Hoo
Amogh, I couldn't help myself. please have a look at the resulting
setup/db/db/schema-430to440.sql
On Thu, Jul 17, 2014 at 11:35 PM, Daan Hoogland wrote:
> On Thu, Jul 17, 2014 at 11:19 PM, Amogh Vasekar
> wrote:
>> c8ca15b95a57a3d79b71c76c913e295f6490f05d
>
> Amogh, it has conflicts. I will hav
On Thu, Jul 17, 2014 at 11:19 PM, Amogh Vasekar
wrote:
> c8ca15b95a57a3d79b71c76c913e295f6490f05d
Amogh, it has conflicts. I will have a look at those in the morning
--
Daan
On Thu, Jul 3, 2014 at 3:27 AM, Prachi Damle wrote:
...
> Commit# 40e28de7275804f4483868ba8a737878ff54fba8
You are intrroducing windows line endings! picking anyway.
> Commit# f37b1524892ab805615dbff2c59e5a1d10c116d3
regards,
--
Daan
2 in
On Tue, Jul 1, 2014 at 11:56 AM, Jayapal Reddy Uradi
wrote:
> Hi Daan,
>
> Please cherry-pick the following commits to 4.4
>
> commit e336796cd5eae39bf7755d981426160a15bc6e9f
> CLOUDSTACK-7028: Fixed adding route for additional public nic on fail over
>
> commit a69c1ee31d233d4a6f77d68fd
On Mon, Jun 30, 2014 at 1:21 PM, Jayapal Reddy Uradi
wrote:
> 004d616322ba55d83407545f5b10c95ce48f75b5
I missed this one but it is in now.
--
Daan
On Tue, Jun 24, 2014 at 7:38 AM, Jayapal Reddy Uradi
wrote:
> a195e50ae7da4b4392844e2984823c1331ca1396
is in
--
Daan
On Wed, Jun 18, 2014 at 10:35 PM, Yoshikazu Nojima wrote:
> 45f0c7367680f4bfbcee470139b708d69322be78
is in
--
Daan
Daan,
Could you cherry-pick 45f0c7367680f4bfbcee470139b708d69322be78 instead
of cd414a0f56798ae801fc464be127e37daabef809?
Regards,
Noji
2014-06-18 11:59 GMT-06:00 Yoshikazu Nojima :
> Daan,
>
> Could you cherry-pick the commit
> "cd414a0f56798ae801fc464be127e37daabef809" into 4.4?
> This is a fi
Hi Daan,
The conflicts resolved looks fine.
You can ignore my patch.
Thanks,
Jayapal
On 17-Jun-2014, at 5:50 PM, Daan Hoogland wrote:
> I don't think I was clear. I don't need a new patch. I did resolve the
> conflict. I need you to check if I did the right thing in branch 4.4
> in EventTypes
I don't think I was clear. I don't need a new patch. I did resolve the
conflict. I need you to check if I did the right thing in branch 4.4
in EventTypes near line 550
your new patch doesn't apply to 4.4 or 4.4-forward
> git am -s
> ~/Downloads/0001-CLOUDSTACK-6922-Updated-events-for-firewall-in
Hi Daan,
Resolved the conflicts and uploaded patch in review board.
https://reviews.apache.org/r/22679/
Thanks,
Jayapal
On 17-Jun-2014, at 4:52 PM, Daan Hoogland
wrote:
> On Tue, Jun 17, 2014 at 8:41 AM, Jayapal Reddy Uradi
> wrote:
>> 2214bd2502a34ee8e671eb6b4efe8cd26e29ac5a
>
>
> I had c
On Tue, Jun 17, 2014 at 8:41 AM, Jayapal Reddy Uradi
wrote:
> 2214bd2502a34ee8e671eb6b4efe8cd26e29ac5a
I had conflicts. Can you have a look near line 550? I resolved by
changing IpAddress to PublicIpAddress.
regards
--
Daan
Looks good Daan. Thanks.
On 12/06/14 3:18 AM, "Daan Hoogland" wrote:
>On Thu, Jun 12, 2014 at 12:49 AM, Nitin Mehta
>wrote:
>> 8a9092c3cd4e3c034f9f4d0a7491875dc080e9dc
>
>
>is in after conflict reolution, please check.
>
>--
>Daan
On Thu, Jun 12, 2014 at 12:49 AM, Nitin Mehta wrote:
> 8a9092c3cd4e3c034f9f4d0a7491875dc080e9dc
is in after conflict reolution, please check.
--
Daan
On Wed, Jun 11, 2014 at 2:39 PM, Harikrishna Patnala
wrote:
> aa75b4388554a502b1073dd78050cd4b364a803e
is in
--
Daan
On Fri, May 30, 2014 at 12:01 PM, Devdeep Singh
wrote:
> f5ce280da32c4e0837fa39651dc801ba3f906e41
is in
--
Daan
On Tue, May 27, 2014 at 4:23 PM, Wido den Hollander wrote:
> 7415a27184c84bce23b1739a7c4d609e2c2e37db
done
--
Daan
thanks Bharat,
It is in.
I run git show on every commit that I then git cherry-pick so you
don't need to send me a link. the full id will do.
regards,
Daan
On Mon, May 5, 2014 at 12:27 PM, Bharat Kumar wrote:
> Hi Daan,
>
> updating the link to diff.
> https://git-wip-us.apache.org/repos/asf?p=
both in
On Mon, May 5, 2014 at 11:56 AM, Harikrishna Patnala
wrote:
> Hi Daan,
>
> Could you cherry pick the following commits to 4.4 branch
>
> 1) Commit ce3074e9a23e71855798cb5decd01d7f9958f6c0 in cloudstack's branch
> refs/heads/4.4-forward
> [ https://git-wip-us.apache.org/repos/asf?p=clouds
Hi Daan,
updating the link to diff.
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=99b4cf788eded0f6f155ff8cda51aeb2e505f764
Thanks
Bharat.
On 05-May-2014, at 3:36 pm, Bharat Kumar
mailto:bharat.ku...@citrix.com>> wrote:
Hi Daan,
please cherry pick the following commit to
On Tue, Apr 29, 2014 at 8:07 AM, Nitin Mehta wrote:
> 3e7ea4e
H Nithin, It is in. I prefer full commit ids if you have them.
thanks
--
Daan
29 matches
Mail list logo
