Return-Path: X-Original-To: apmail-cordova-issues-archive@minotaur.apache.org Delivered-To: apmail-cordova-issues-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A30FA10A26 for ; Mon, 28 Apr 2014 21:29:34 +0000 (UTC) Received: (qmail 38166 invoked by uid 500); 28 Apr 2014 21:29:28 -0000 Delivered-To: apmail-cordova-issues-archive@cordova.apache.org Received: (qmail 37857 invoked by uid 500); 28 Apr 2014 21:29:22 -0000 Mailing-List: contact issues-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 issues@cordova.apache.org Received: (qmail 37678 invoked by uid 99); 28 Apr 2014 21:29:20 -0000 Received: from arcas.apache.org (HELO arcas.apache.org) (140.211.11.28) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Apr 2014 21:29:20 +0000 Date: Mon, 28 Apr 2014 21:29:20 +0000 (UTC) From: "ASF subversion and git services (JIRA)" To: issues@cordova.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Commented] (CB-6521) Merge plugin development branches into master MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/CB-6521?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13983579#comment-13983579 ] ASF subversion and git services commented on CB-6521: ----------------------------------------------------- Commit 3d51112bd4a8ba7855fc0fbf1e41449638f3f97b in cordova-plugin-dialogs's branch refs/heads/dev from [~iclelland] [ https://git-wip-us.apache.org/repos/asf?p=cordova-plugin-dialogs.git;h=3d51112 ] CB-6521: Remove development branch > Merge plugin development branches into master > --------------------------------------------- > > Key: CB-6521 > URL: https://issues.apache.org/jira/browse/CB-6521 > Project: Apache Cordova > Issue Type: Task > Components: Plugin Battery Status, Plugin Camera, Plugin Console, Plugin Contacts, Plugin Device, Plugin Device Motion, Plugin Device Orientation, Plugin File, Plugin File Transfer, Plugin Geolocation, Plugin Globalization, Plugin InAppBrowser, Plugin Media, Plugin Media Capture, Plugin Network Information, Plugin SplashScreen, Plugin Statusbar, Plugin Vibration > Reporter: Ian Clelland > Assignee: Ian Clelland > > Following the mailing list discussion, all plugins development is going to take place on the master branch. Any current work on the "dev" branches should be merged in to master. > After things settle down, the "dev" branch names should be deleted to prevent any accidental branching. > *Update*: The dev branch is not being deleted; instead, all of the files within it are being removed, and the README is being updated to indicate that development should proceed on the master branch. -- This message was sent by Atlassian JIRA (v6.2#6252)