[03/12] couch-index commit: updated refs/heads/1994-merge-rcouch to 7c1666b

[da...@apache.org]

couch_index_sup should be started by the couch application

I had this patch landing in a custommer repository for awhile. Since
couch_index is always dependent of couch it's better to add it to the
couch application supervision rather than on its own.


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

Branch: refs/heads/1994-merge-rcouch
Commit: 62bddab9c75f4a95a9558dab4890f6eb1637fd35
Parents: 5ae0421
Author: benoitc <be...@apache.org>
Authored: Thu Jan 9 23:29:54 2014 +0100
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Wed Feb 12 17:58:22 2014 -0600

----------------------------------------------------------------------
 src/couch_index.app.src |  3 +--
 src/couch_index_app.erl | 27 ---------------------------
 2 files changed, 1 insertion(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-index/blob/62bddab9/src/couch_index.app.src
----------------------------------------------------------------------
diff --git a/src/couch_index.app.src b/src/couch_index.app.src
index 6a59e99..921e5d2 100644
--- a/src/couch_index.app.src
+++ b/src/couch_index.app.src
@@ -15,6 +15,5 @@
     {vsn, "1.3.0"},
     {modules, []},
     {registered, [couch_index_server]},
-    {applications, [kernel, stdlib, couch]},
-    {mod, {couch_index_app, []}}
+    {applications, [kernel, stdlib, couch]}
 ]}.

http://git-wip-us.apache.org/repos/asf/couchdb-couch-index/blob/62bddab9/src/couch_index_app.erl
----------------------------------------------------------------------
diff --git a/src/couch_index_app.erl b/src/couch_index_app.erl
deleted file mode 100644
index 6bafdcb..0000000
--- a/src/couch_index_app.erl
+++ /dev/null
@@ -1,27 +0,0 @@
-% Licensed under the Apache License, Version 2.0 (the "License"); you may not
-% use this file except in compliance with the License. You may obtain a copy of
-% the License at
-%
-%   http://www.apache.org/licenses/LICENSE-2.0
-%
-% Unless required by applicable law or agreed to in writing, software
-% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-% License for the specific language governing permissions and limitations under
-% the License.
-
--module(couch_index_app).
-
--behaviour(application).
-
--include_lib("couch/include/couch_db.hrl").
-
--export([start/2, stop/1]).
-
-start(_Type, _Args) ->
-    couch_util:start_app_deps(couch_index),
-    couch_index_sup:start_link().
-
-
-stop(_) ->
-    ok.