Return-Path: X-Original-To: apmail-cloudstack-dev-archive@www.apache.org Delivered-To: apmail-cloudstack-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BCD9218CB7 for ; Wed, 19 Aug 2015 15:28:00 +0000 (UTC) Received: (qmail 27709 invoked by uid 500); 19 Aug 2015 15:27:55 -0000 Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org Received: (qmail 27654 invoked by uid 500); 19 Aug 2015 15:27:55 -0000 Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list dev@cloudstack.apache.org Received: (qmail 27643 invoked by uid 99); 19 Aug 2015 15:27:55 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Aug 2015 15:27:55 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id ADFA11AA7EC for ; Wed, 19 Aug 2015 15:27:54 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.006 X-Spam-Level: X-Spam-Status: No, score=-0.006 tagged_above=-999 required=6.31 tests=[RP_MATCHES_RCVD=-0.006, SPF_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id IBIJjeDpaBMk for ; Wed, 19 Aug 2015 15:27:46 +0000 (UTC) Received: from sbprmx2.schubergphilis.com (sbprmx2.schubergphilis.com [195.66.90.57]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTPS id 269CA42996 for ; Wed, 19 Aug 2015 15:27:46 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by sbprmx2.schubergphilis.com (Postfix) with ESMTP id 328921291F for ; Wed, 19 Aug 2015 17:27:39 +0200 (MEST) X-Virus-Scanned: amavisd-new at schubergphilis.com Received: from sbprmx2.schubergphilis.com ([127.0.0.1]) by localhost (sbprmx2.schubergphilis.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M3KltLNpRvNA for ; Wed, 19 Aug 2015 17:27:39 +0200 (MEST) Received: from SBPOTMG401.sbp.lan (edge.schubergphilis.com [195.66.90.11]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by sbprmx2.schubergphilis.com (Postfix) with ESMTPS id 258D0128FB for ; Wed, 19 Aug 2015 17:27:39 +0200 (MEST) Received: from SBPOMF101.sbp.lan (10.71.2.130) by SBPOTMG401.sbp.lan (10.71.3.110) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 19 Aug 2015 17:27:38 +0200 Received: from SBPOMB402.sbp.lan ([fe80::2410:c2c8:67bf:d067]) by SBPOMF101.sbp.lan ([fe80::253f:3a21:d553:7947%15]) with mapi id 14.03.0248.002; Wed, 19 Aug 2015 17:27:38 +0200 From: Remi Bergsma To: "dev@cloudstack.apache.org" Subject: Merging Pull Requests Thread-Topic: Merging Pull Requests Thread-Index: AQHQ2pOUuEGRT3QljU6JTk23E+Rp5A== Date: Wed, 19 Aug 2015 15:27:38 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.71.96.123] Content-Type: text/plain; charset="us-ascii" Content-ID: <08E0D81348047F45A4771B73E001C174@schubergphilis.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Hi all, As it is now, additions to CloudStack need to go through a GitHub PR and, i= f accepted, merged to the Apache remote (not in GitHub). This means that me= rging a PR for CloudStack is a bit more involved than merging a normal GitH= ub PR. To help with this, Miguel, Rajani, Daan and myself, have created some scrip= ts. One is 'git-pr' to merge a PR, the second one is 'git-fwd-merge' used b= y RM to merge branches (starting 4.6). Links: [1] PR to add the scripts [2] Wiki=20 I'd be great if we would all use these scripts to merge Pull Requests (inst= ead of applying patches). Let me know if you need help! Thanks & Regards, Remi [1] https://github.com/apache/cloudstack/pull/721 [2] https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=3D6131= 1655