couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject couch commit: updated refs/heads/master to e6303b6
Date Thu, 22 May 2014 11:02:22 GMT
Repository: couchdb-couch
Updated Branches:
  refs/heads/master 274efa577 -> e6303b693


Fix typo introduced during conflict resolution


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/e6303b69
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/e6303b69
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/e6303b69

Branch: refs/heads/master
Commit: e6303b693ea15ceaed28518a404758fa1e3383c5
Parents: 274efa5
Author: Robert Newson <rnewson@apache.org>
Authored: Thu May 22 12:02:13 2014 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Thu May 22 12:02:13 2014 +0100

----------------------------------------------------------------------
 src/couch_httpd.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e6303b69/src/couch_httpd.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd.erl b/src/couch_httpd.erl
index 077697d..437ef08 100644
--- a/src/couch_httpd.erl
+++ b/src/couch_httpd.erl
@@ -44,7 +44,7 @@ start_link(https) ->
     ServerOpts0 =
         [{cacertfile, config:get("ssl", "cacert_file", nil)},
          {keyfile, config:get("ssl", "key_file", nil)},
-         {certfile, onfig:get("ssl", "cert_file", nil)},
+         {certfile, config:get("ssl", "cert_file", nil)},
          {password, config:get("ssl", "password", nil)},
          {secure_renegotiate, SecureRenegotiate},
          {versions, Versions},


Mime
View raw message