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 30D88DFA1 for ; Thu, 25 Oct 2012 18:27:46 +0000 (UTC) Received: (qmail 86891 invoked by uid 500); 25 Oct 2012 18:27:45 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 86865 invoked by uid 500); 25 Oct 2012 18:27:45 -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 86853 invoked by uid 99); 25 Oct 2012 18:27:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Oct 2012 18:27:45 +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 (nike.apache.org: domain of randall.leeds@gmail.com designates 209.85.210.52 as permitted sender) Received: from [209.85.210.52] (HELO mail-da0-f52.google.com) (209.85.210.52) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Oct 2012 18:27:39 +0000 Received: by mail-da0-f52.google.com with SMTP id f10so859111dak.11 for ; Thu, 25 Oct 2012 11:27:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=sPdTcZsKl7HVUubrlM9vUAsIZ/HJcoIyud2uAcrMYo8=; b=KAuhILdAUBW5gySLI3keh5uIosrwZ8T1x1HG7hQ46xXgdEF02MUjhTB+JGbUdCus9Q EVtBQEe9K1LLmh75q6SA8RncCdX6T0HwxT+74cVfE3Lx7DiYIatOL1mBvwh3+m9HtX6W LLV6Iz36xufMjKgOWeD4WKnyvh+hReoS5J/20RyZnD8PLJ/2jg/02x4y26ODX5co6TO/ YsSuMCyDI9nHRzftegUHuilAuB8WtMxFDoAE380UCyc07P65r7MBbntM+hxRo8j71XuR y2oEmvphQHCDaV3T08U09C6R+lcgB/LoFEGFvZdSFPk9ec93zhi8bEtQsQhoNDAFx7jG YBSA== MIME-Version: 1.0 Received: by 10.68.222.37 with SMTP id qj5mr61524050pbc.132.1351189637855; Thu, 25 Oct 2012 11:27:17 -0700 (PDT) Received: by 10.68.81.65 with HTTP; Thu, 25 Oct 2012 11:27:17 -0700 (PDT) In-Reply-To: References: <-6781800427653859644@unknownmsgid> Date: Thu, 25 Oct 2012 11:27:17 -0700 Message-ID: Subject: Re: 1.2.x Hotfixes From: Randall Leeds To: dev@couchdb.apache.org Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked by ClamAV on apache.org Reviewed by rnewson and committed. On Thu, Oct 11, 2012 at 2:42 AM, Noah Slater wrote: > Thanks. +1 on getting these sorted, natch > > On Thu, Oct 11, 2012 at 10:37 AM, Robert Newson wrote: > >> I can review on Saturday if no one gets to it. >> >> Noah, that's how I read it, these are fixes in 1.2 that aren't on >> master, so they'd be regressions without Randall's merge. >> >> Sent from the ocean floor >> >> On 11 Oct 2012, at 10:28, Noah Slater wrote: >> >> > These were fixes that landed on the 1.2.x branch, but were never ported >> to >> > master? >> > >> > I assume that's what you're proposing to do now? >> > >> > On Thu, Oct 11, 2012 at 12:24 AM, Randall Leeds > >wrote: >> > >> >> Hey devs, >> >> >> >> Before 1.2 shipped, I made some hotfixes on the 1.2.x branch (I know, >> >> I'm sorry). >> >> >> >> I finally went through them. I posted a branch called 'hotfixes1.2' to >> >> the asf repo. >> >> >> >> Here are all the changes that I had made, along with the commit on the >> >> hotfix branch that corresponds. >> >> >> >> >> >> >> >> These are related to improving logging during file operation failures: >> >> >> >> 04c4a1041de06e8e39983cf9616c8baf9d889106 >> >> ede9482fc3c9e629572ab1376d88f4499c4c8beb >> >> cd238b42d1333cece5ab899c35c3b83ada8d448a >> >> af9e1c883ca4accb209cccc7ac9d26efa4daf1fd >> >> ba8fa86890087650a02a8ebaaea2537468999472 >> >> >> >> ... it is encompassed by 6e3f17a85b3de5d3c5ff2865bc58a1b9a6a47fab >> >> >> >> >> >> This one logs all 500 errors at the httpd level: >> >> >> >> 6887953432e9ccdef4bb8785b782fc53f6e61602 >> >> >> >> ... it is exactly 205ccb07114107e6daf7a156764c751e2f9f1571 >> >> >> >> >> >> >> >> This one updated NEWS & CHANGES for the above: >> >> >> >> 25e079117218b52c18d51dca0810b974ec80ff8a >> >> >> >> ... And I took the liberty of including the below as well >> >> and put all the notice in a1cc138689973f5f6e5ff68aa9204dbe1ddb179c >> >> >> >> >> >> This one fixed COUCHDB-1445: >> >> >> >> 94e72e7fcc66f6740a3ec517a1bccf2cfa024cf7 >> >> >> >> ... is exactly f79591d73c7fa02f2938875bceac691703938f81 except I >> >> left out the test because it was strange to begin with. >> >> >> >> >> >> This one is no longer necessary, as the new 1.3 indexer code never had >> >> this bug: >> >> >> >> a38f59d1752ec611f0edc26e8f641a36b52f0c67 >> >> >> >> >> >> Okay to merge? Thanks for looking. >> >> >> > >> > >> > >> > -- >> > NS >> > > > > -- > NS