couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [31/50] [abbrv] couch commit: updated refs/heads/import-rcouch to e2dbc79
Date Thu, 06 Feb 2014 17:40:13 GMT
fix tests


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

Branch: refs/heads/import-rcouch
Commit: 244b997a739999168fecfc677599663499e9cbdf
Parents: c276679
Author: benoitc <benoitc@apache.org>
Authored: Thu Jan 9 20:56:15 2014 +0100
Committer: Paul J. Davis <paul.joseph.davis@gmail.com>
Committed: Thu Feb 6 11:38:29 2014 -0600

----------------------------------------------------------------------
 src/couch.app.src.script | 2 +-
 src/couch.erl            | 1 -
 src/couch_util.erl       | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/244b997a/src/couch.app.src.script
----------------------------------------------------------------------
diff --git a/src/couch.app.src.script b/src/couch.app.src.script
index 599efee..c947ead 100644
--- a/src/couch.app.src.script
+++ b/src/couch.app.src.script
@@ -61,7 +61,7 @@ end,
         ]},
         {mod, {couch_app, []}},
         {env, [{couch_rel, RelVsn}]},
-        {applications, [kernel, stdlib, crypto, sasl, public_key, ssl,
+        {applications, [kernel, stdlib, crypto, sasl, asn1, public_key, ssl,
                         inets, oauth, ibrowse, mochiweb, os_mon]}
     ]}
 ].

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/244b997a/src/couch.erl
----------------------------------------------------------------------
diff --git a/src/couch.erl b/src/couch.erl
index 8526e68..4b2032a 100644
--- a/src/couch.erl
+++ b/src/couch.erl
@@ -43,7 +43,6 @@ release_version() ->
     end.
 
 start() ->
-    application:load(couch),
     couch_util:start_app_deps(couch),
     application:start(couch).
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/244b997a/src/couch_util.erl
----------------------------------------------------------------------
diff --git a/src/couch_util.erl b/src/couch_util.erl
index 76a9293..f4d66ef 100644
--- a/src/couch_util.erl
+++ b/src/couch_util.erl
@@ -40,6 +40,7 @@
 %% @spec start_app_deps(App :: atom()) -> ok
 %% @doc Start depedent applications of App.
 start_app_deps(App) ->
+    application:load(App),
     {ok, DepApps} = application:get_key(App, applications),
     [ensure_started(A) || A <- DepApps],
     ok.


Mime
View raw message