couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fdman...@apache.org
Subject svn commit: r1027314 - /couchdb/branches/new_replicator/src/couchdb/couch_app.erl
Date Mon, 25 Oct 2010 23:46:01 GMT
Author: fdmanana
Date: Mon Oct 25 23:46:01 2010
New Revision: 1027314

URL: http://svn.apache.org/viewvc?rev=1027314&view=rev
Log:
Merged revision 956220 from trunk:
    
    fix issue COUCHDB-805. tested on R13B-04 and R14A. also public_key is
    available since R12B5.
    

Modified:
    couchdb/branches/new_replicator/src/couchdb/couch_app.erl

Modified: couchdb/branches/new_replicator/src/couchdb/couch_app.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/new_replicator/src/couchdb/couch_app.erl?rev=1027314&r1=1027313&r2=1027314&view=diff
==============================================================================
--- couchdb/branches/new_replicator/src/couchdb/couch_app.erl (original)
+++ couchdb/branches/new_replicator/src/couchdb/couch_app.erl Mon Oct 25 23:46:01 2010
@@ -20,7 +20,7 @@
 
 start(_Type, DefaultIniFiles) ->
     IniFiles = get_ini_files(DefaultIniFiles),
-    case start_apps([crypto, sasl, inets, oauth, ssl, ibrowse, mochiweb]) of
+    case start_apps([crypto, public_key, sasl, inets, oauth, ssl, ibrowse, mochiweb]) of
     ok ->
         couch_server_sup:start_link(IniFiles);
     {error, Reason} ->



Mime
View raw message