incubator-cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rohit Yadav <rohit.ya...@citrix.com>
Subject [DISCUSS] Pull some 4.0 specific commits on master?
Date Mon, 08 Oct 2012 14:13:37 GMT
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.
Mime
View raw message