couchdb commit: updated refs/heads/master to 6415cd1

[wo...@apache.org]

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 <wo...@atypical.net>
Authored: Tue Aug 2 15:07:54 2016 -0400
Committer: Joan Touzet <wo...@atypical.net>
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")