Return-Path: X-Original-To: apmail-cordova-dev-archive@www.apache.org Delivered-To: apmail-cordova-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 0C6F110964 for ; Thu, 4 Jul 2013 17:02:17 +0000 (UTC) Received: (qmail 76332 invoked by uid 500); 4 Jul 2013 17:02:16 -0000 Delivered-To: apmail-cordova-dev-archive@cordova.apache.org Received: (qmail 76302 invoked by uid 500); 4 Jul 2013 17:02:16 -0000 Mailing-List: contact dev-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list dev@cordova.apache.org Received: (qmail 76289 invoked by uid 99); 4 Jul 2013 17:02:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jul 2013 17:02:15 +0000 X-ASF-Spam-Status: No, hits=0.3 required=5.0 tests=FRT_ADOBE2,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of brian.leroux@gmail.com designates 209.85.223.181 as permitted sender) Received: from [209.85.223.181] (HELO mail-ie0-f181.google.com) (209.85.223.181) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jul 2013 17:02:10 +0000 Received: by mail-ie0-f181.google.com with SMTP id x12so3395992ief.26 for ; Thu, 04 Jul 2013 10:01:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:content-type; bh=HusFQXIJHTEL3KIHqxbQvnAB6bqhlaoRg4savNJUPc4=; b=aqkh3vxOankr9M7AKEy+vy/uNK5QHVAaZedVjP7bLg6zmhhxsTCis6n+4ZV/HUPY/o mWaN0UufMaq/TQeBiZrIdHnGS/sl7OzS3VKwqoHpJJ3i0Ztc7QerzmS4sUOW2mJvj1I7 0GSd5nrlYPt4Q1y6hT9KDhnmJpgVccc+0fcwGOQoNqZ0a32ckMLgvUxRPnq743qT3NoF sB3wW22rvNC0TO3+u6VGjmD1qMIE9FKCX66BiKCMmiU/bt4cjkdQc0OvGXBTVIS65FHX ZhFZFJVP1H8GQYOvrzV8n80qLw04STBmw2770Jsrf0k2rb5SgrSla7pLBEYpwVOwdPg4 pYOw== MIME-Version: 1.0 X-Received: by 10.43.139.5 with SMTP id iu5mr2602038icc.107.1372957310381; Thu, 04 Jul 2013 10:01:50 -0700 (PDT) Sender: brian.leroux@gmail.com Received: by 10.50.222.197 with HTTP; Thu, 4 Jul 2013 10:01:50 -0700 (PDT) In-Reply-To: References: Date: Thu, 4 Jul 2013 10:01:50 -0700 X-Google-Sender-Auth: aGw_XAKK-cbS2cy6_VikS6xsi_s Message-ID: Subject: Re: CLI's master2 From: Brian LeRoux To: dev@cordova.apache.org Content-Type: text/plain; charset=ISO-8859-1 X-Virus-Checked: Checked by ClamAV on apache.org So, what is the difference between master and master2? Right now, master from what I understand is in heavy use w/ tonnes of bugs and fixes. On Thu, Jul 4, 2013 at 9:52 AM, Ian Clelland wrote: > We've had that ticket open for some time now, and Braden has tried on a > couple of occasions to get some movement on it, but there's been no action > so far. > > > On Thu, Jul 4, 2013 at 12:34 PM, Filip Maj wrote: > >> If you want to give it a shot, go for it! >> >> Didn't we have an INFRA issue filed for them to move the master HEAD >> pointer to master2 and fix this for us? :P >> >> On 7/4/13 9:23 AM, "Andrew Grieve" wrote: >> >> >I feel that having master2 around is now causing us more harm than would >> >be >> >done if we just merged it into master. I'd like to merge it into master, >> >delete master2, and move on. >> >>