Return-Path: X-Original-To: apmail-couchdb-dev-archive@www.apache.org Delivered-To: apmail-couchdb-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 5FFEFDE2B for ; Wed, 13 Mar 2013 20:41:30 +0000 (UTC) Received: (qmail 67111 invoked by uid 500); 13 Mar 2013 20:41:29 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 67035 invoked by uid 500); 13 Mar 2013 20:41:29 -0000 Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list dev@couchdb.apache.org Received: (qmail 67027 invoked by uid 99); 13 Mar 2013 20:41:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Mar 2013 20:41:29 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of paul.joseph.davis@gmail.com designates 209.85.219.41 as permitted sender) Received: from [209.85.219.41] (HELO mail-oa0-f41.google.com) (209.85.219.41) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Mar 2013 20:41:25 +0000 Received: by mail-oa0-f41.google.com with SMTP id i10so1603690oag.0 for ; Wed, 13 Mar 2013 13:41:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:mime-version:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=GaL6kbHCTc09VQrqPXfMFY8ZpWonnkiCUH6AO+G0y/A=; b=B486nIivUFTDnVhAwfZQgdP/2xiFM8iqFCp7hwgtnwbRCog8gS3uCrwauIFHwYLfXp uzhMMFmYkR4mMT7Fs8wJYjX0I8ORjGdwuOXhvUZGU8f8he3lacmCp8eKnlT7zQfM+qaH U8RAAkVA325VuXCH5uKOTlfEKkRviexyK/fg5LlCMoCt/L5l7BVzYH+d4gLJIBPWNlB/ UHwfeCSa4unNsWS/l5aCG2KuzstZ1Vfkg5p1WV23OBH6mkpbsf5FGUbGRsgWbwsKI0n9 nfJrpdXYDrgmOEW/BjqKyi/dTUe2jg74l3UI58+D+QEQXV/0UaFX0HrfVp2fKtwx2GLS BTgA== X-Received: by 10.182.86.162 with SMTP id q2mr17412410obz.35.1363207264476; Wed, 13 Mar 2013 13:41:04 -0700 (PDT) MIME-Version: 1.0 Received: by 10.60.160.194 with HTTP; Wed, 13 Mar 2013 13:40:24 -0700 (PDT) In-Reply-To: References: <20130313183500.8634CDEDD@tyr.zones.apache.org> From: Paul Davis Date: Wed, 13 Mar 2013 15:40:24 -0500 Message-ID: Subject: Re: couchdb pull request: Latest fauxton updates as of march 13 To: dev@couchdb.apache.org Cc: Noah Slater Content-Type: text/plain; charset=ISO-8859-1 X-Virus-Checked: Checked by ClamAV on apache.org Reading this I see two big chunks: lots of minor template/JS tweaks and an import of some PouchDB sources. The PouchDB is almost exactly 50% of the lines added. Russel could have probably organized his commits a bit better to indicate that but given our relatively lax attitude to maintaining a clean history I can't really ding him on it. I understand that its good to be sure and clear things that need it, but I don't think the level of work here rises to that standard. OTOH, I think this is pointing out that we still haven't fully groked how to deal with GitHub PRs at the ASF. In a perfect world I'd turn them off and force everyone to submit code via mailing list. Granted that's probably a super minority position but I think we could use some more concrete project specific guidelines on contributions via PR. On Wed, Mar 13, 2013 at 3:24 PM, Noah Slater wrote: > Erk, sorry, this is the link: > > http://incubator.apache.org/ip-clearance/index.html > > Please note also that this process will take three days, and I will steward > it. I don't want us to cut corners because this process is seen as a > burden. Although in some respects, I do want code drops to seem like a > burden so that we instinctually avoid them as a community. ;) > > > On 13 March 2013 20:21, Noah Slater wrote: > >> Okay. I am happy to be overruled if we have consensus this if fine. >> >> I took a look and the changset seemed substantial. >> >> What do other people think? >> >> Before you answer, please make sure you are familiar with: >> >> incubator.apache.org/ip-clearance/ip-clearance-template.html >> >> The key here is that: >> >> * It doesn't matter if the contributors are committers on the project >> * If the contribution is big enough that we consider it "done away from >> the project" then it needs IP Clearance >> >> The goal here is to have as much activity happening on the project lists >> as possible. The project welcomes code drops, but we need to recognise that >> they ARE code drops, and do the proper legal clearance. (And obviously, >> figure out contribution workflows so that committers are not contributing >> via code drops.) >> >> >> >> On 13 March 2013 20:10, Paul Davis wrote: >> >>> I'm confused on the IP clearance requirement. On IRC you described >>> this as a code drop but as I read through this I'm seeing a number of >>> fairly minor changes and a new feature for running M/R in the browser. >>> Given that Fauxton is so new this seems like rather straight forward >>> "working on new project" activity. >>> >>> The diff stats listed are: >>> >>> 20 changed files with 846 additions and 216 deletions. >>> >>> which seems rather modest to me given that its all HTML and JS. >>> >>> You quoted this bit on IRC: >>> >>> "Any code that was developed outside of the ASF SVN repository must be >>> processed like this, even if the external developer is an ASF >>> committer." >>> >>> And I'm confused on what that means in the context of Git and >>> specifically in context of GitHub PRs. I think there are some obvious >>> cases in both directions. A PR for a typo obviously doesn't require IP >>> clearance. The original Fauxton drop and the BigCouch merge obviously >>> do require IP clearance. >>> >>> But this seems like a fairly normal contribution. If we were rocking >>> the patches over email to apply to SVN I don't think anyone would have >>> batted an eye at this. Given the PR here it seems awfully like a >>> standard RTC pattern to me. >>> >>> While I agree that there's always a judgement call to be made on what >>> constitutes "development outside the ASF" I don't think this case >>> meets the criteria for what was intended by that policy. >>> >>> On Wed, Mar 13, 2013 at 2:16 PM, Noah Slater wrote: >>> > Note to committers. Please do not merge this yet. >>> > >>> > We are going to have to put this through the IP Clearance process. >>> > >>> > >>> > On 13 March 2013 18:35, chewbranca wrote: >>> > >>> >> GitHub user chewbranca opened a pull request: >>> >> >>> >> https://github.com/apache/couchdb/pull/52 >>> >> >>> >> Latest fauxton updates as of march 13 >>> >> >>> >> Lots of updates and fixes >>> >> >>> >> * Initial view editor implementation >>> >> * Advanced view functionality >>> >> * Edit design docs >>> >> * Use _rewrites in fauxton couchapp >>> >> * Grunt template updates >>> >> * Lots of random fixes and cleanup >>> >> >>> >> You can merge this pull request into a Git repository by running: >>> >> >>> >> $ git pull https://github.com/cloudant-labs/couchdb fauxton-mar-13 >>> >> >>> >> Alternatively you can review and apply these changes as the patch at: >>> >> >>> >> https://github.com/apache/couchdb/pull/52.patch >>> >> >>> >> ---- >>> >> commit 7f88a2afedb27555b7e92aae1be2d4163bca0393 >>> >> Author: Russell Branca >>> >> Date: 2013-02-07T01:51:05Z >>> >> >>> >> Initial in browser MR using PouchDB.mapreduce.js >>> >> >>> >> commit 04018d243540ae71b703191e5125818506cf2dd0 >>> >> Author: Russell Branca >>> >> Date: 2013-02-08T21:29:02Z >>> >> >>> >> Adding PouchDB file blurbs >>> >> >>> >> commit 61ac6f86710192debc50c0cc2275d5ef94a6c658 >>> >> Author: Russell Branca >>> >> Date: 2013-02-14T02:32:01Z >>> >> >>> >> Move view editor around and lots more >>> >> >>> >> commit 4e038d789b54243aa5b05a819af09c385f5a1806 >>> >> Author: Russell Branca >>> >> Date: 2013-02-24T21:42:54Z >>> >> >>> >> Add meta data and more to views >>> >> >>> >> commit f3300bbde51ac6c9d12d4cb83d67eef27c6fdeb5 >>> >> Author: Ryan Ramage >>> >> Date: 2013-02-25T22:32:56Z >>> >> >>> >> Adding support for fauxton behind a rewrite in a couchapp >>> >> >>> >> commit 68d36d33819c09af30daabea98e093f2b1622e2c >>> >> Author: Russell Branca >>> >> Date: 2013-02-25T23:35:19Z >>> >> >>> >> Merge pull request #16 from garden20/fauxton-couchapp-rewrites >>> >> >>> >> Adding support for fauxton behind a rewrite in a couchapp >>> >> >>> >> commit 6033ac3fb6929258c2d47be272d66f4729bcecd1 >>> >> Author: Simon Metson >>> >> Date: 2013-02-26T16:15:38Z >>> >> >>> >> remove shared databases from the all_dbs page - not a couchdb >>> feature >>> >> (might >>> >> come back depending on how we support replicas). >>> >> >>> >> commit 829db1ab39ad2a14b6b7a810fe947e47ea01eb66 >>> >> Author: Russell Branca >>> >> Date: 2013-02-26T19:48:27Z >>> >> >>> >> Add initial error handling for view establish functions >>> >> >>> >> commit 2c81ee740a20999b58199c00df927eff635168b4 >>> >> Author: Russell Branca >>> >> Date: 2013-03-06T00:25:15Z >>> >> >>> >> Clean up for bugs and non save/preview use >>> >> >>> >> commit 7d73a824acb6053b501a7f6dbd887168bad2fdb0 >>> >> Author: Russell Branca >>> >> Date: 2013-03-06T00:41:47Z >>> >> >>> >> Merge pull request #17 from cloudant-labs/fauxton-pouch-mr >>> >> >>> >> Advanced _view options and editor >>> >> >>> >> commit 0649bafacf15669d294258187e6c189759c1c93a >>> >> Author: Russell Branca >>> >> Date: 2013-03-06T01:13:27Z >>> >> >>> >> Add results meta to all docs collection >>> >> >>> >> commit 3d4781de0b37ada0ebff3a6c4dc2a1f6da9feb95 >>> >> Author: Simon Metson >>> >> Date: 2013-03-11T15:30:04Z >>> >> >>> >> remove templating configuration from grunt.js >>> >> >>> >> commit 73350051f9794f6428a4b36ce7be1c0561ebbad7 >>> >> Author: Simon Metson >>> >> Date: 2013-03-11T16:25:52Z >>> >> >>> >> update tasks >>> >> >>> >> commit 9667be958948cad2e5d410ca4bc403664d694679 >>> >> Author: Russell Branca >>> >> Date: 2013-03-11T23:33:53Z >>> >> >>> >> Temporarily disable contribute addon and add gitignore >>> >> >>> >> commit 1bb903bed7d0bfda05d5c9eb0084a9dbd69110f5 >>> >> Author: Russell Branca >>> >> Date: 2013-03-11T23:39:57Z >>> >> >>> >> Add link to docs in api bar >>> >> >>> >> commit 3293c1d4d732048eed063cdb7c654d81e8ef8eeb >>> >> Author: Russell Branca >>> >> Date: 2013-03-12T00:24:10Z >>> >> >>> >> Update all docs and all design docs links >>> >> >>> >> commit e6dbe7a1cdb70378f17e782f26ea5a2ca5a88761 >>> >> Author: Simon Metson >>> >> Date: 2013-03-12T11:19:04Z >>> >> >>> >> Correct default template >>> >> >>> >> Spotted during review with Mike W. >>> >> >>> >> commit 283e25a23147883c497203fa03e38ea552b40225 >>> >> Author: Michael Wallace >>> >> Date: 2013-03-12T11:24:57Z >>> >> >>> >> Merge pull request #19 from >>> >> cloudant-labs/1690-template-settings-from-config >>> >> >>> >> 1690 template settings from config >>> >> >>> >> commit 0534bd8c5d82f0fb13da8d8a7a161d7f73b7b191 >>> >> Author: Mike Wallace >>> >> Date: 2013-03-12T11:05:18Z >>> >> >>> >> Fix import of pouchdb >>> >> >>> >> commit b18aa31b75f09e31028a97a74dffd81fc0b5667a >>> >> Author: Michael Wallace >>> >> Date: 2013-03-12T11:30:42Z >>> >> >>> >> Merge pull request #20 from >>> cloudant-labs/fauxton-fix-pouchdb-import >>> >> >>> >> Fix import of pouchdb >>> >> >>> >> commit f0b587c41c7ed777328827d06dc5a91521468c82 >>> >> Author: Russell Branca >>> >> Date: 2013-03-12T23:25:28Z >>> >> >>> >> Cleanup some broken things on documents >>> >> >>> >> commit 25881bb138b9341c1b31f573efe094f26ce66de9 >>> >> Author: Russell Branca >>> >> Date: 2013-03-13T17:31:02Z >>> >> >>> >> Merge remote-tracking branch 'upstream/fauxton' into fauxton >>> >> >>> >> Conflicts: >>> >> src/fauxton/app/templates/databases/sidebar.html >>> >> src/fauxton/app/templates/fauxton/api_bar.html >>> >> >>> >> commit 0d08a755880586cfcb23f0240b57ff8a6a5ba858 >>> >> Author: Russell Branca >>> >> Date: 2013-03-13T17:32:59Z >>> >> >>> >> Fix span width for new database button >>> >> >>> >> ---- >>> >> >>> >> >>> > >>> > >>> > -- >>> > NS >>> >> >> >> >> -- >> NS >> > > > > -- > NS