Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 43DD8200B64 for ; Tue, 2 Aug 2016 21:09:34 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 42A9F160A76; Tue, 2 Aug 2016 19:09:34 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B1418160A65 for ; Tue, 2 Aug 2016 21:09:33 +0200 (CEST) Received: (qmail 26804 invoked by uid 500); 2 Aug 2016 19:09:32 -0000 Mailing-List: contact commits-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 commits@couchdb.apache.org Received: (qmail 26794 invoked by uid 99); 2 Aug 2016 19:09:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Aug 2016 19:09:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CB926E0007; Tue, 2 Aug 2016 19:09:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wohali@apache.org To: commits@couchdb.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: couchdb commit: updated refs/heads/master to 6415cd1 Date: Tue, 2 Aug 2016 19:09:32 +0000 (UTC) archived-at: Tue, 02 Aug 2016 19:09:34 -0000 Repository: couchdb Updated Branches: refs/heads/master 4f6d5865f -> 6415cd170 Remove incorrect logfile sed attempt in dev/run This code was actually replacing the file_compression = snappy line, which was preventing snappy from being tested in the test suite. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6415cd17 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6415cd17 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6415cd17 Branch: refs/heads/master Commit: 6415cd1702e16b8493c479af6ddca54ed2b44599 Parents: 4f6d586 Author: Joan Touzet Authored: Tue Aug 2 15:07:54 2016 -0400 Committer: Joan Touzet Committed: Tue Aug 2 15:07:54 2016 -0400 ---------------------------------------------------------------------- dev/run | 5 ----- 1 file changed, 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/6415cd17/dev/run ---------------------------------------------------------------------- diff --git a/dev/run b/dev/run index 2a9ca3f..a2646d2 100755 --- a/dev/run +++ b/dev/run @@ -243,11 +243,6 @@ def boot_haproxy(ctx): def hack_default_ini(ctx, node, content): - # Replace log file - logfile = toposixpath(os.path.join(ctx['devdir'], "logs", "%s.log" % node)) - repl = "file = %s" % logfile - contents = re.sub("(?m)^file.*$", repl, content) - # Replace couchjs command couchjs = os.path.join(ctx['rootdir'], "src", "couch", "priv", "couchjs") mainjs = os.path.join(ctx['rootdir'], "share", "server", "main.js")