diff options
| author | Robert Newson <rnewson@apache.org> | 2014-02-12 11:58:29 +0000 |
|---|---|---|
| committer | Robert Newson <rnewson@apache.org> | 2014-02-12 20:13:24 +0000 |
| commit | dcf11314ebe97230ffd3553e93c2a8deac33a65c (patch) | |
| tree | 3b31b09a1e441eb6796fa00424af3ed7febf244f | |
| parent | 1a2d250273dec6ee2e84174939db42f95efb605f (diff) | |
| download | couchdb-1843-feature-bigcouch-couch-log.tar.gz | |
Replace twig with couch_log1843-feature-bigcouch-couch-log
| -rw-r--r-- | etc/couchdb/default.ini.tpl.in | 1 | ||||
| -rw-r--r-- | rebar.config.script | 4 | ||||
| -rw-r--r-- | rel/reltool.config | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in index 9d9465ea8..8ff76d54f 100644 --- a/etc/couchdb/default.ini.tpl.in +++ b/etc/couchdb/default.ini.tpl.in @@ -157,7 +157,6 @@ _replicate = {couch_replicator_httpd, handle_req} _uuids = {couch_httpd_misc_handlers, handle_uuids_req} _restart = {couch_httpd_misc_handlers, handle_restart_req} _stats = {couch_httpd_stats_handlers, handle_stats_req} -_log = {couch_httpd_misc_handlers, handle_log_req} _session = {couch_httpd_auth, handle_session_req} _oauth = {couch_httpd_oauth, handle_oauth_req} diff --git a/rebar.config.script b/rebar.config.script index 9eae80947..6e7ff75be 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -17,6 +17,7 @@ os:putenv("COUCHDB_CONFIG", ConfigureEnv). DepDescs = [ + {couch_log, "couchdb-couch-log", {branch, "1843-feature-bigcouch"}}, {chttpd, "couchdb-chttpd", {branch, "1843-feature-bigcouch"}}, {config, "couchdb-config", {branch, "1843-feature-bigcouch"}}, {couch, "couchdb-couch", {branch, "1843-feature-bigcouch"}}, @@ -32,8 +33,7 @@ DepDescs = [ {mochiweb, "couchdb-mochiweb", {branch, "1843-feature-bigcouch"}}, {oauth, "couchdb-oauth", {branch, "1843-feature-bigcouch"}}, {rexi, "couchdb-rexi", {branch, "1843-feature-bigcouch"}}, - {snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}}, - {twig, "couchdb-twig", {branch, "1843-feature-bigcouch"}} + {snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}} ], MakeDep = fun({AppName, RepoName, Version}) -> diff --git a/rel/reltool.config b/rel/reltool.config index 476dca616..331e2b15d 100644 --- a/rel/reltool.config +++ b/rel/reltool.config @@ -33,7 +33,7 @@ snappy, ssl, stdlib, - twig, + couch_log, xmerl ]}, {rel, "start_clean", "", [kernel, stdlib]}, @@ -55,7 +55,7 @@ {app, mem3, [{incl_cond, include}]}, {app, rexi, [{incl_cond, include}]}, {app, snappy, [{incl_cond, include}]}, - {app, twig, [{incl_cond, include}]} + {app, couch_log, [{incl_cond, include}]} ]}. {overlay_vars, "couchdb.config"}. |