couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject git commit: updated refs/heads/1696-backport-mochiweb-2-4-2-1.3.x to 6170654
Date Sat, 03 Aug 2013 20:53:20 GMT
Updated Branches:
  refs/heads/1696-backport-mochiweb-2-4-2-1.3.x 92c33a7ee -> 6170654a0


support R16B01

Due to non-OTP-ness, couch need to start its own OTP apps.
R16B01 requires asn1 as a dependency for public_key.
Closes COUCHDB-1833.


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

Branch: refs/heads/1696-backport-mochiweb-2-4-2-1.3.x
Commit: 6170654a016af86feb01573db3610d62905b6028
Parents: 92c33a7
Author: Dave Cottlehuber <dch@apache.org>
Authored: Tue Jun 25 16:01:58 2013 +0200
Committer: Dave Cottlehuber <dch@apache.org>
Committed: Tue Jun 25 16:01:58 2013 +0200

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


http://git-wip-us.apache.org/repos/asf/couchdb/blob/6170654a/src/couchdb/couch_app.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_app.erl b/src/couchdb/couch_app.erl
index f109780..e73c402 100644
--- a/src/couchdb/couch_app.erl
+++ b/src/couchdb/couch_app.erl
@@ -20,7 +20,7 @@
 
 start(_Type, DefaultIniFiles) ->
     IniFiles = get_ini_files(DefaultIniFiles),
-    case start_apps([crypto, public_key, sasl, inets, oauth, ssl, ibrowse, mochiweb, os_mon])
of
+    case start_apps([crypto, asn1, public_key, sasl, inets, oauth, ssl, ibrowse, mochiweb,
os_mon]) of
     ok ->
         couch_server_sup:start_link(IniFiles);
     {error, Reason} ->


Mime
View raw message