You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Rohit Yadav <ro...@citrix.com> on 2012/10/08 16:13:37 UTC
[DISCUSS] Pull some 4.0 specific commits on master?
Hey folks,
Since the ant build system is broken on master, we committed few build related patches to 4.0 instead of master. Should we pull them on master?
As we move on with deprecating ant on master, does that even make sense to pull such build related commits on master from 4.0?
Or, should we use 4.0 as a maintenance branch where we cherry pick only useful bug fixes and other commits from master and vice-versa, while do build etc. 4.0 related stuff on 4.0.
These are the seven out of sync commits I know of:
commit 4448042037a35dca62950aaf36426b802a00afdd
commit a286f68723b9503fe719ad3063f66379750cb48f
commit 21bea9c8e220489a90a40bb365fe5fd3e1d519ed (revert)
commit e241925057c44fafde3d5b755be72d494b35c68b
commit 3b78d6980af4720bd71784471c1b1b8b3dd2f34d
commit 98eef5c9490c349d621180823807561c0ee8b357
commit 8ec7cf2b423f751e62db887ffb76cc8be0843719
Regards.
RE: [DISCUSS] Pull some 4.0 specific commits on master?
Posted by Rohit Yadav <ro...@citrix.com>.
Done, cherry picked the 8 patches to master.
________________________________________
From: Chiradeep Vittal [Chiradeep.Vittal@citrix.com]
Sent: Monday, October 08, 2012 10:49 PM
To: CloudStack DeveloperList
Subject: Re: [DISCUSS] Pull some 4.0 specific commits on master?
+1 on maintaining ant for another couple of weeks.
On 10/8/12 7:13 AM, "Rohit Yadav" <ro...@citrix.com> wrote:
>Hey folks,
>
>Since the ant build system is broken on master, we committed few build
>related patches to 4.0 instead of master. Should we pull them on master?
>
>As we move on with deprecating ant on master, does that even make sense
>to pull such build related commits on master from 4.0?
>Or, should we use 4.0 as a maintenance branch where we cherry pick only
>useful bug fixes and other commits from master and vice-versa, while do
>build etc. 4.0 related stuff on 4.0.
>
>These are the seven out of sync commits I know of:
>
>commit 4448042037a35dca62950aaf36426b802a00afdd
>commit a286f68723b9503fe719ad3063f66379750cb48f
>commit 21bea9c8e220489a90a40bb365fe5fd3e1d519ed (revert)
>commit e241925057c44fafde3d5b755be72d494b35c68b
>commit 3b78d6980af4720bd71784471c1b1b8b3dd2f34d
>commit 98eef5c9490c349d621180823807561c0ee8b357
>commit 8ec7cf2b423f751e62db887ffb76cc8be0843719
>
>Regards.
RE: [DISCUSS] Pull some 4.0 specific commits on master?
Posted by Rohit Yadav <ro...@citrix.com>.
Alright, let's do that after 4.0 release?
________________________________________
From: Edison Su [Edison.su@citrix.com]
Sent: Tuesday, October 09, 2012 2:01 AM
To: cloudstack-dev@incubator.apache.org
Cc: CloudStack DeveloperList
Subject: Re: [DISCUSS] Pull some 4.0 specific commits on master?
I would suggest to get rid of ant on master, so people can work with maven, and fix maven.
Sent from my iPhone
On Oct 8, 2012, at 10:20 AM, "Chiradeep Vittal" <Ch...@citrix.com> wrote:
> +1 on maintaining ant for another couple of weeks.
>
> On 10/8/12 7:13 AM, "Rohit Yadav" <ro...@citrix.com> wrote:
>
>> Hey folks,
>>
>> Since the ant build system is broken on master, we committed few build
>> related patches to 4.0 instead of master. Should we pull them on master?
>>
>> As we move on with deprecating ant on master, does that even make sense
>> to pull such build related commits on master from 4.0?
>> Or, should we use 4.0 as a maintenance branch where we cherry pick only
>> useful bug fixes and other commits from master and vice-versa, while do
>> build etc. 4.0 related stuff on 4.0.
>>
>> These are the seven out of sync commits I know of:
>>
>> commit 4448042037a35dca62950aaf36426b802a00afdd
>> commit a286f68723b9503fe719ad3063f66379750cb48f
>> commit 21bea9c8e220489a90a40bb365fe5fd3e1d519ed (revert)
>> commit e241925057c44fafde3d5b755be72d494b35c68b
>> commit 3b78d6980af4720bd71784471c1b1b8b3dd2f34d
>> commit 98eef5c9490c349d621180823807561c0ee8b357
>> commit 8ec7cf2b423f751e62db887ffb76cc8be0843719
>>
>> Regards.
>
Re: [DISCUSS] Pull some 4.0 specific commits on master?
Posted by Edison Su <Ed...@citrix.com>.
I would suggest to get rid of ant on master, so people can work with maven, and fix maven.
Sent from my iPhone
On Oct 8, 2012, at 10:20 AM, "Chiradeep Vittal" <Ch...@citrix.com> wrote:
> +1 on maintaining ant for another couple of weeks.
>
> On 10/8/12 7:13 AM, "Rohit Yadav" <ro...@citrix.com> wrote:
>
>> Hey folks,
>>
>> Since the ant build system is broken on master, we committed few build
>> related patches to 4.0 instead of master. Should we pull them on master?
>>
>> As we move on with deprecating ant on master, does that even make sense
>> to pull such build related commits on master from 4.0?
>> Or, should we use 4.0 as a maintenance branch where we cherry pick only
>> useful bug fixes and other commits from master and vice-versa, while do
>> build etc. 4.0 related stuff on 4.0.
>>
>> These are the seven out of sync commits I know of:
>>
>> commit 4448042037a35dca62950aaf36426b802a00afdd
>> commit a286f68723b9503fe719ad3063f66379750cb48f
>> commit 21bea9c8e220489a90a40bb365fe5fd3e1d519ed (revert)
>> commit e241925057c44fafde3d5b755be72d494b35c68b
>> commit 3b78d6980af4720bd71784471c1b1b8b3dd2f34d
>> commit 98eef5c9490c349d621180823807561c0ee8b357
>> commit 8ec7cf2b423f751e62db887ffb76cc8be0843719
>>
>> Regards.
>
Re: [DISCUSS] Pull some 4.0 specific commits on master?
Posted by Chiradeep Vittal <Ch...@citrix.com>.
+1 on maintaining ant for another couple of weeks.
On 10/8/12 7:13 AM, "Rohit Yadav" <ro...@citrix.com> wrote:
>Hey folks,
>
>Since the ant build system is broken on master, we committed few build
>related patches to 4.0 instead of master. Should we pull them on master?
>
>As we move on with deprecating ant on master, does that even make sense
>to pull such build related commits on master from 4.0?
>Or, should we use 4.0 as a maintenance branch where we cherry pick only
>useful bug fixes and other commits from master and vice-versa, while do
>build etc. 4.0 related stuff on 4.0.
>
>These are the seven out of sync commits I know of:
>
>commit 4448042037a35dca62950aaf36426b802a00afdd
>commit a286f68723b9503fe719ad3063f66379750cb48f
>commit 21bea9c8e220489a90a40bb365fe5fd3e1d519ed (revert)
>commit e241925057c44fafde3d5b755be72d494b35c68b
>commit 3b78d6980af4720bd71784471c1b1b8b3dd2f34d
>commit 98eef5c9490c349d621180823807561c0ee8b357
>commit 8ec7cf2b423f751e62db887ffb76cc8be0843719
>
>Regards.