Return-Path: X-Original-To: apmail-incubator-cloudstack-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0421FD943 for ; Mon, 8 Oct 2012 14:14:09 +0000 (UTC) Received: (qmail 84991 invoked by uid 500); 8 Oct 2012 14:14:08 -0000 Delivered-To: apmail-incubator-cloudstack-dev-archive@incubator.apache.org Received: (qmail 84943 invoked by uid 500); 8 Oct 2012 14:14:08 -0000 Mailing-List: contact cloudstack-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-dev@incubator.apache.org Received: (qmail 84935 invoked by uid 99); 8 Oct 2012 14:14:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Oct 2012 14:14:08 +0000 X-ASF-Spam-Status: No, hits=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of rohit.yadav@citrix.com designates 203.166.19.134 as permitted sender) Received: from [203.166.19.134] (HELO SMTP.CITRIX.COM.AU) (203.166.19.134) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Oct 2012 14:14:02 +0000 X-IronPort-AV: E=Sophos;i="4.80,554,1344211200"; d="scan'208";a="13007484" Received: from banpmailmx02.citrite.net ([10.103.128.74]) by SYDPIPO01.CITRIX.COM.AU with ESMTP/TLS/RC4-MD5; 08 Oct 2012 14:13:39 +0000 Received: from BANPMAILBOX01.citrite.net ([10.103.128.71]) by BANPMAILMX02.citrite.net ([10.103.128.74]) with mapi; Mon, 8 Oct 2012 19:43:38 +0530 From: Rohit Yadav To: "cloudstack-dev@incubator.apache.org" Date: Mon, 8 Oct 2012 19:43:37 +0530 Subject: [DISCUSS] Pull some 4.0 specific commits on master? Thread-Topic: [DISCUSS] Pull some 4.0 specific commits on master? Thread-Index: Ac2lXxx3bAXqVAElRye6DP7yxCQxnA== Message-ID: <188B329D-9EE7-4593-8D67-6BFD5A60F78A@citrix.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Virus-Checked: Checked by ClamAV on apache.org Hey folks, Since the ant build system is broken on master, we committed few build rela= ted 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?=20 Or, should we use 4.0 as a maintenance branch where we cherry pick only use= ful 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.=