You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/02/11 09:07:38 UTC
[36/41] couch commit: updated refs/heads/import-rcouch to f07bbfc
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/cad57e5a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/cad57e5a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/cad57e5a
Branch: refs/heads/import-rcouch
Commit: cad57e5a580ce76a23b23e496b1d3b0c059ed6cc
Parents: c7c431a
Author: benoitc <be...@apache.org>
Authored: Thu Jan 9 20:56:15 2014 +0100
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Tue Feb 11 02:05:21 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/cad57e5a/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/cad57e5a/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/cad57e5a/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.